Menu
▾
▴
benson-commit — Benson Commit Mailing List
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(27) |
Jul
(24) |
Aug
(64) |
Sep
(15) |
Oct
(72) |
Nov
(28) |
Dec
(44) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(72) |
Feb
(58) |
Mar
(33) |
Apr
(3) |
May
(5) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
(24) |
Nov
(29) |
Dec
(12) |
| 2003 |
Jan
(37) |
Feb
(44) |
Mar
(13) |
Apr
(23) |
May
(9) |
Jun
(3) |
Jul
|
Aug
(7) |
Sep
(33) |
Oct
(30) |
Nov
(31) |
Dec
(11) |
| 2004 |
Jan
(4) |
Feb
(35) |
Mar
(14) |
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
(5) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
(2) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Bob T. <bt...@us...> - 2005-03-30 15:16:11
|
Update of /cvsroot/benson/benson3/src/perl/Benson/lib/Benson/Handlers/Network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11413/src/perl/Benson/lib/Benson/Handlers/Network Modified Files: Acknowledge.pm Alertlist.pm Submit.pm Update.pm Log Message: Only opening up one db handle per process...slight better. Index: Acknowledge.pm =================================================================== RCS file: /cvsroot/benson/benson3/src/perl/Benson/lib/Benson/Handlers/Network/Acknowledge.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Acknowledge.pm 22 Dec 2001 01:51:24 -0000 1.3 --- Acknowledge.pm 30 Mar 2005 15:15:33 -0000 1.4 *************** *** 22,32 **** # Database Connection Code # ! $dbh = DBI->connect($s->DBIConnectString, $s->DBIUsername, $s->DBIPassword); ! $s->trace("Database handle for ".$s->DBIConnectString." is ".$dbh, 3); ! if($dbh eq undef) { ! $s->log("(DBI error) Connection to the database ".$s->DBIConnectString." failed.", FATAL); ! return ERROR; ! } # --- 22,34 ---- # Database Connection Code # ! # $dbh = DBI->connect($s->DBIConnectString, $s->DBIUsername, $s->DBIPassword); ! # $s->trace("Database handle for ".$s->DBIConnectString." is ".$dbh, 3); ! # if($dbh eq undef) { ! # $s->log("(DBI error) Connection to the database ".$s->DBIConnectString." failed.", FATAL); ! # return ERROR; ! # } ! ! $dbh = $s->dbhandle; # *************** *** 57,61 **** # Disconnect from the database # ! $dbh->disconnect(); return OK; } --- 59,63 ---- # Disconnect from the database # ! # $dbh->disconnect(); return OK; } Index: Alertlist.pm =================================================================== RCS file: /cvsroot/benson/benson3/src/perl/Benson/lib/Benson/Handlers/Network/Alertlist.pm,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** Alertlist.pm 12 Feb 2002 02:44:33 -0000 1.8 --- Alertlist.pm 30 Mar 2005 15:15:33 -0000 1.9 *************** *** 49,59 **** # Database Connection Code # ! my $dbh = DBI->connect($s->DBIConnectString, $s->DBIUsername, $s->DBIPassword); ! $s->trace("Database handle for ".$s->DBIConnectString." is ".$dbh, 3); ! if($dbh eq undef) { ! $s->log("(DBI error) Connection to the database ".$s->DBIConnectString." failed.", FATAL); ! return \%header; ! } # --- 49,61 ---- # Database Connection Code # ! # my $dbh = DBI->connect($s->DBIConnectString, $s->DBIUsername, $s->DBIPassword); ! # $s->trace("Database handle for ".$s->DBIConnectString." is ".$dbh, 3); ! # if($dbh eq undef) { ! # $s->log("(DBI error) Connection to the database ".$s->DBIConnectString." failed.", FATAL); ! # return \%header; ! # } ! ! my $dbh = $s->dbhandle; # *************** *** 88,92 **** # We are finished with database, kill the connection. # ! $dbh->disconnect(); # --- 90,94 ---- # We are finished with database, kill the connection. # ! # $dbh->disconnect(); # Index: Submit.pm =================================================================== RCS file: /cvsroot/benson/benson3/src/perl/Benson/lib/Benson/Handlers/Network/Submit.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** Submit.pm 2 Aug 2004 19:18:26 -0000 1.6 --- Submit.pm 30 Mar 2005 15:15:33 -0000 1.7 *************** *** 87,100 **** my $rc = 0; ! $dbh = DBI->connect($s->DBIConnectString, ! $s->DBIUsername, ! $s->DBIPassword); ! if($dbh eq undef) { ! $s->log("(DBI error) Connection to the database ".$s->DBIConnectString." failed.", FATAL); ! return 1; ! } $rc = insert_into_database($a); # FIXME: We don't check. ! $dbh->disconnect(); if($rc) { # We have failed --- 87,101 ---- my $rc = 0; ! # $dbh = DBI->connect($s->DBIConnectString, ! # $s->DBIUsername, ! # $s->DBIPassword); ! # if($dbh eq undef) { ! # $s->log("(DBI error) Connection to the database ".$s->DBIConnectString." failed.", FATAL); ! # return 1; ! # } ! $dbh = $s->dbhandle; $rc = insert_into_database($a); # FIXME: We don't check. ! # $dbh->disconnect(); if($rc) { # We have failed Index: Update.pm =================================================================== RCS file: /cvsroot/benson/benson3/src/perl/Benson/lib/Benson/Handlers/Network/Update.pm,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** Update.pm 26 Nov 2003 00:14:20 -0000 1.5 --- Update.pm 30 Mar 2005 15:15:33 -0000 1.6 *************** *** 36,46 **** # Database Connection Code # ! $dbh = DBI->connect($s->DBIConnectString, $s->DBIUsername, $s->DBIPassword); ! $s->trace("Database handle for ".$s->DBIConnectString." is ".$dbh, 3); ! if($dbh eq undef) { ! $s->log("(DBI error) Connection to the database ".$s->DBIConnectString." failed.", FATAL); ! return ERROR; ! } # --- 36,48 ---- # Database Connection Code # ! # $dbh = DBI->connect($s->DBIConnectString, $s->DBIUsername, $s->DBIPassword); ! # $s->trace("Database handle for ".$s->DBIConnectString." is ".$dbh, 3); ! # if($dbh eq undef) { ! # $s->log("(DBI error) Connection to the database ".$s->DBIConnectString." failed.", FATAL); ! # return ERROR; ! # } ! ! $dbh = $s->dbhandle; # *************** *** 90,94 **** # Disconnect from the database # ! $dbh->disconnect(); return OK; } --- 92,96 ---- # Disconnect from the database # ! # $dbh->disconnect(); return OK; } |
|
From: Bob T. <bt...@us...> - 2005-03-30 15:15:59
|
Update of /cvsroot/benson/benson3/src/perl/Benson/lib/Benson/Handlers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11413/src/perl/Benson/lib/Benson/Handlers Modified Files: Shutdown.pm Log Message: Only opening up one db handle per process...slight better. Index: Shutdown.pm =================================================================== RCS file: /cvsroot/benson/benson3/src/perl/Benson/lib/Benson/Handlers/Shutdown.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Shutdown.pm 1 Sep 2001 18:44:39 -0000 1.1 --- Shutdown.pm 30 Mar 2005 15:15:32 -0000 1.2 *************** *** 5,8 **** --- 5,9 ---- print " Benson::Handlers::Shutdown begins\n"; print $s->hostname."\n"; + $s->dbhandle->disconnect; undef $s; } |
|
From: Bob T. <bt...@us...> - 2005-02-14 19:51:41
|
Update of /cvsroot/benson/benson3/scripts/cgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18228 Modified Files: alertlist.cgi.tmpl alertview.cgi.tmpl Log Message: Added the create ticket field. Index: alertlist.cgi.tmpl =================================================================== RCS file: /cvsroot/benson/benson3/scripts/cgi/alertlist.cgi.tmpl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** alertlist.cgi.tmpl 24 Feb 2003 07:43:03 -0000 1.13 --- alertlist.cgi.tmpl 14 Feb 2005 19:51:32 -0000 1.14 *************** *** 193,196 **** --- 193,205 ---- my ($ts, $ah, $seq) = split /\./, $id; my $dstr = POSIX::strftime("%Y-%m-%d %H:%M:%S", localtime($ts)); + my $RTserver = $queue->get("RTserverURL"); + my $create_ticket = ""; + if ($RTserver ne "http://changeme") { + my $RTqueue = $queue->get("RTqueue"); + $create_ticket = <<EOT; + [<a href="$RTserver/Ticket/Create.html??Queue=$RTqueue&Subject=$agent:$severity:$subsystem&Status=open">Create Ticket</a>] + EOT + } + $sub_alerts_text .= <<EOT; <tr> *************** *** 200,204 **** <td align="center" bgcolor="$bgcolor"><font color="#FFFFFF"><b>$severity</b></font></td> <td align="center">$subsystem</td> ! <td align="left">$message</td> <td align="center">$number</td> </tr> --- 209,213 ---- <td align="center" bgcolor="$bgcolor"><font color="#FFFFFF"><b>$severity</b></font></td> <td align="center">$subsystem</td> ! <td align="left">$message $create_ticket</td> <td align="center">$number</td> </tr> Index: alertview.cgi.tmpl =================================================================== RCS file: /cvsroot/benson/benson3/scripts/cgi/alertview.cgi.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** alertview.cgi.tmpl 9 Feb 2004 22:55:50 -0000 1.6 --- alertview.cgi.tmpl 14 Feb 2005 19:51:32 -0000 1.7 *************** *** 259,262 **** --- 259,270 ---- my $subsystem = $alertlist{$key}->{subsystem}; my $message = $alertlist{$key}->{message}; + my $RTserver = $queue->get("RTserverURL"); + my $create_ticket = ""; + if ($RTserver ne "http://changeme") { + my $RTqueue = $queue->get("RTqueue"); + $create_ticket = <<EOT; + [<a href="$RTserver/Ticket/Create.html??Queue=$RTqueue&Subject=$agent:$sev:$subsystem&Status=open">Create Ticket</a>] + EOT + } print <<EOT; <tr> *************** *** 268,272 **** <td align="center" bgcolor="$severity{$sev}->{color}"><font color="#FFFFFF"><b>$sev</b></font></td> <td align="center">$subsystem</td> ! <td align="left">$message</td> <td align="center">$total</td> </tr> --- 276,280 ---- <td align="center" bgcolor="$severity{$sev}->{color}"><font color="#FFFFFF"><b>$sev</b></font></td> <td align="center">$subsystem</td> ! <td align="left">$message $create_ticket</td> <td align="center">$total</td> </tr> *************** *** 339,343 **** <i><font size="1"> <a href="http://benson.sourceforge.net/">Benson Distributed Monitoring System</a><br> ! Copyright © 1999, 2000, 2001, 2002, 2003, 2004 by Bob Tribit<br> <br> This program is distributed in the hope that it will be useful,<br> --- 347,351 ---- <i><font size="1"> <a href="http://benson.sourceforge.net/">Benson Distributed Monitoring System</a><br> ! Copyright © 1999, 2000, 2001, 2002, 2003, 2004, 2005 by Bob Tribit<br> <br> This program is distributed in the hope that it will be useful,<br> |
|
From: Bob T. <bt...@us...> - 2005-02-14 17:19:44
|
Update of /cvsroot/benson/benson3/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18626 Modified Files: benson.conf.tmpl Log Message: Added the Request Tracker URL directive Index: benson.conf.tmpl =================================================================== RCS file: /cvsroot/benson/benson3/conf/benson.conf.tmpl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** benson.conf.tmpl 1 Mar 2004 22:28:15 -0000 1.13 --- benson.conf.tmpl 14 Feb 2005 17:19:35 -0000 1.14 *************** *** 97,100 **** --- 97,106 ---- WebserverURL http://changeme + # + # RTserverURL: <string> + # This is for the Request Tracker URL for creating tickets + # + RTserverURL http://changeme + # # HistoricalOnline: <integer> (in days) |
|
From: Bob T. <bt...@us...> - 2004-08-02 19:26:49
|
Update of /cvsroot/benson/benson3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13334 Modified Files: ChangeLog Log Message: Update the changelog Index: ChangeLog =================================================================== RCS file: /cvsroot/benson/benson3/ChangeLog,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -r1.36 -r1.37 *** ChangeLog 19 Feb 2004 01:59:02 -0000 1.36 --- ChangeLog 2 Aug 2004 19:26:41 -0000 1.37 *************** *** 2,5 **** --- 2,6 ---- -Added extensible file support for email handler -Added xml file support for email handler + -Fixed many things wrong, however, there is a protocol incompatibility version 3.1a5 *NOT RELEASED* |
|
From: Bob T. <bt...@us...> - 2004-08-02 19:18:35
|
Update of /cvsroot/benson/benson3/src/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11459/src/network Modified Files: v31_network_request.c Log Message: Fixed many show stopping things. Index: v31_network_request.c =================================================================== RCS file: /cvsroot/benson/benson3/src/network/v31_network_request.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** v31_network_request.c 16 Dec 2003 16:17:46 -0000 1.10 --- v31_network_request.c 2 Aug 2004 19:18:26 -0000 1.11 *************** *** 4,9 **** ! int process_trap_v31(bnet_req_v31 *req_pkt, SV* server_ref) { char destination[DST_MAXSIZE_v31]; char agent[AGT_MAXSIZE_v31]; --- 4,10 ---- ! int process_trap_v31(bnet_req_v31 *req_pkt, SV* server_ref, bn_netaccept_ctx *conn_ctx) { + char *peer_ipaddr; char destination[DST_MAXSIZE_v31]; char agent[AGT_MAXSIZE_v31]; *************** *** 12,15 **** --- 13,18 ---- char message[MSG_MAXSIZE_v31]; char status[STA_MAXSIZE_v31]; + struct sockaddr_in peer_addr; + int peer_length; SV *alert_ref; SV *result; *************** *** 23,26 **** --- 26,32 ---- safe_strncpy(status, "initial", STA_MAXSIZE_v31); + getpeername(conn_ctx->connfd, (struct sockaddr *)&peer_addr, &peer_length); + peer_ipaddr = inet_ntoa(peer_addr.sin_addr); + ENTER; SAVETMPS; *************** *** 29,32 **** --- 35,39 ---- bn_require_module("Benson::Handlers::Network::Submit"); alert_ref = sv_2mortal(bn_new_object("Benson::Alert", 0)); + bn_set_attribute(alert_ref, "peer_ipaddr", newSVpv(peer_ipaddr,0)); bn_set_attribute(alert_ref, "destination", newSVpv(destination, 0)); bn_set_attribute(alert_ref, "agent", newSVpv(agent, 0)); *************** *** 187,191 **** printf("benson trap received\n"); ! rc = process_trap_v31(&req_pkt, server_ref); resp_hdr.resp.trap.rc = htons(rc); --- 194,198 ---- printf("benson trap received\n"); ! rc = process_trap_v31(&req_pkt, server_ref, conn_ctx); resp_hdr.resp.trap.rc = htons(rc); |
|
From: Bob T. <bt...@us...> - 2004-08-02 19:18:35
|
Update of /cvsroot/benson/benson3/handlers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11459/handlers Modified Files: A10email.pm Log Message: Fixed many show stopping things. Index: A10email.pm =================================================================== RCS file: /cvsroot/benson/benson3/handlers/A10email.pm,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** A10email.pm 2 Aug 2004 15:52:23 -0000 1.12 --- A10email.pm 2 Aug 2004 19:18:26 -0000 1.13 *************** *** 438,441 **** --- 438,442 ---- my $alertlist = $queue->sorted_href_alert_list(); $s->trace("M ($identity) A10email action handler begins...",3); + $s->trace("M ($identity) Client IP Address: ".$t->peer_ipaddr,3); my $filename = $s->ServerRoot."/etc/email.xml"; |
|
From: Bob T. <bt...@us...> - 2004-08-02 19:18:35
|
Update of /cvsroot/benson/benson3/src/perl/Benson/lib/Benson/Handlers/Network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11459/src/perl/Benson/lib/Benson/Handlers/Network Modified Files: Submit.pm Log Message: Fixed many show stopping things. Index: Submit.pm =================================================================== RCS file: /cvsroot/benson/benson3/src/perl/Benson/lib/Benson/Handlers/Network/Submit.pm,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** Submit.pm 21 May 2002 20:11:28 -0000 1.5 --- Submit.pm 2 Aug 2004 19:18:26 -0000 1.6 *************** *** 16,20 **** my $hash = ""; foreach my $word (split /\s+/, $value) { ! $hash .= substr($value, 0, 1); } return $hash; --- 16,20 ---- my $hash = ""; foreach my $word (split /\s+/, $value) { ! $hash .= substr($word, 0, 1); } return $hash; *************** *** 28,31 **** --- 28,32 ---- $hash .= build_hash($a->subsystem); $hash .= build_hash($a->message); + $hash = substr($hash, 0, 30); my @row = $dbh->selectrow_array(qq{SELECT NEXTVAL('alerts_sequence')}); my $seq = $row[0]; |
|
From: Bob T. <bt...@us...> - 2004-08-02 15:52:32
|
Update of /cvsroot/benson/benson3/handlers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32211 Modified Files: A10email.pm Log Message: The latest email handler, with bug fixes. Index: A10email.pm =================================================================== RCS file: /cvsroot/benson/benson3/handlers/A10email.pm,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** A10email.pm 14 May 2004 03:10:32 -0000 1.11 --- A10email.pm 2 Aug 2004 15:52:23 -0000 1.12 *************** *** 80,85 **** my %hash; $hash{line_count} = $rule->{name}; ! $hash{count} = $rule->{count} || ".*"; $hash{starttime} = $rule->{time}->{start}; $hash{endtime} = $rule->{time}->{end}; --- 80,92 ---- my %hash; + $hash{last} = $rule->{last}; $hash{line_count} = $rule->{name}; ! $hash{count} = $rule->{count}; ! if(!defined $rule->{count}) { ! $hash{count} = ".*"; ! } ! if($rule->{count} eq "*") { ! $hash{count} = ".*"; ! } $hash{starttime} = $rule->{time}->{start}; $hash{endtime} = $rule->{time}->{end}; *************** *** 357,360 **** --- 364,368 ---- } + $s->trace("M ($identity) total=$total rule->count=".$rule->{count}, 4); if($agent_found && $severity_found && $subsystem_found && $message_found && *************** *** 379,390 **** } if($rule->{pass} eq "+") { last; } } else { ! my $total_matched = $agent_found + $severity_found + $subsystem_found + ! $message_found + $self->match_total_count($total, $rule->{count}) + ! $self->match_weekday_time($rule->{starttime}, $rule->{endtime}, $rule->{weekday}); ! $s->trace("C ($identity) did not match ($total_matched/6) on $filename:$line_count", 4); } } --- 387,424 ---- } + $s->trace("C ($identity) pass = ".$rule->{pass}." last=".$rule->{last}, 4); if($rule->{pass} eq "+") { + $s->trace("C ($identity) pass stopping processing"); + last; + } + if($rule->{last} eq "yes") { + $s->trace("C ($identity) last stopping processing"); last; } } else { ! my $total = $self->match_total_count($total, $rule->{count}); ! my $weekday_time = $self->match_weekday_time($rule->{starttime}, $rule->{endtime}, $rule->{weekday}); ! my $total_matched = $agent_found + $severity_found + $subsystem_found + $message_found + $total + $weekday_time; ! my $not_matched_on = "("; ! if(!$agent_found) { ! $not_matched_on .= "agent:"; ! } ! if(!$severity_found) { ! $not_matched_on .= "severity:"; ! } ! if(!$subsystem_found) { ! $not_matched_on .= "subsystem:"; ! } ! if(!$message_found) { ! $not_matched_on .= "message:"; ! } ! if(!$total) { ! $not_matched_on .= "total:"; ! } ! if(!$weekday_time) { ! $not_matched_on .= "weekday_time:"; ! } ! $not_matched_on .= ")"; ! $s->trace("C ($identity) did not match ($total_matched/6)$not_matched_on on $filename:$line_count", 4); } } *************** *** 439,443 **** foreach my $email (keys %{$emails}) { $s->trace("M ($identity) Sending alert email to $email", 3); ! # $self->send_email($email, $t); } --- 473,477 ---- foreach my $email (keys %{$emails}) { $s->trace("M ($identity) Sending alert email to $email", 3); ! $self->send_email($email, $t); } |
|
From: <ben...@id...> - 2004-05-22 12:25:34
|
Dear Open Source developer I am doing a research project on "Fun and Software Development" in which I kindly invite you to participate. You will find the online survey under http://fasd.ethz.ch/qsf/. The questionnaire consists of 53 questions and you will need about 15 minutes to complete it. With the FASD project (Fun and Software Development) we want to define the motivational significance of fun when software developers decide to engage in Open Source projects. What is special about our research project is that a similar survey is planned with software developers in commercial firms. This procedure allows the immediate comparison between the involved individuals and the conditions of production of these two development models. Thus we hope to obtain substantial new insights to the phenomenon of Open Source Development. With many thanks for your participation, Benno Luthiger PS: The results of the survey will be published under http://www.isu.unizh.ch/fuehrung/blprojects/FASD/. We have set up the mailing list fa...@we... for this study. Please see http://fasd.ethz.ch/qsf/mailinglist_en.html for registration to this mailing list. _______________________________________________________________________ Benno Luthiger Swiss Federal Institute of Technology Zurich 8092 Zurich Mail: benno.luthiger(at)id.ethz.ch _______________________________________________________________________ |
|
From: Bob T. <bt...@us...> - 2004-05-14 03:10:44
|
Update of /cvsroot/benson/benson3/handlers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18075 Modified Files: A10email.pm Log Message: Added the latest changes. Index: A10email.pm =================================================================== RCS file: /cvsroot/benson/benson3/handlers/A10email.pm,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** A10email.pm 19 Feb 2004 01:59:03 -0000 1.10 --- A10email.pm 14 May 2004 03:10:32 -0000 1.11 *************** *** 27,30 **** --- 27,34 ---- my $current_weekday = $current_weekday - 1; # 0-6 starting on Monday + if((!defined $start) && (!defined $end) && (!defined $weekday)) { + return 1; + } + my @days; push @days, substr($weekday, 1, 1); # Monday *************** *** 73,89 **** sub parse_xml_rule_block { ! my ($self, $rule_name, $rule_ref) = @_; my %hash; ! $hash{line_count} = $rule_name; ! $hash{count} = $rule_ref->{rule}->{$rule_name}->{count} || ".*"; ! $hash{starttime} = $rule_ref->{rule}->{$rule_name}->{time}->{start}; ! $hash{endtime} = $rule_ref->{rule}->{$rule_name}->{time}->{end}; ! $hash{weekday} = $rule_ref->{rule}->{$rule_name}->{time}->{weekday}; # # Grab the agents # ! my $agents = $rule_ref->{rule}->{$rule_name}->{agent}; if(ref($agents) eq "ARRAY") { ### for multiple values foreach my $agent (@{$agents}) { --- 77,93 ---- sub parse_xml_rule_block { ! my ($self, $rule, $rule_ref) = @_; my %hash; ! $hash{line_count} = $rule->{name}; ! $hash{count} = $rule->{count} || ".*"; ! $hash{starttime} = $rule->{time}->{start}; ! $hash{endtime} = $rule->{time}->{end}; ! $hash{weekday} = $rule->{time}->{weekday}; # # Grab the agents # ! my $agents = $rule->{agent}; if(ref($agents) eq "ARRAY") { ### for multiple values foreach my $agent (@{$agents}) { *************** *** 99,103 **** # Grab the severities # ! my $severities = $rule_ref->{rule}->{$rule_name}->{severity}; if(ref($severities) eq "ARRAY") { ### for multiple values foreach my $severity (@{$severities}) { --- 103,107 ---- # Grab the severities # ! my $severities = $rule->{severity}; if(ref($severities) eq "ARRAY") { ### for multiple values foreach my $severity (@{$severities}) { *************** *** 113,117 **** # Grab the subsystems # ! my $subsystems = $rule_ref->{rule}->{$rule_name}->{subsystem}; if(ref($subsystems) eq "ARRAY") { ### for multiple values foreach my $subsystem (@{$subsystems}) { --- 117,121 ---- # Grab the subsystems # ! my $subsystems = $rule->{subsystem}; if(ref($subsystems) eq "ARRAY") { ### for multiple values foreach my $subsystem (@{$subsystems}) { *************** *** 127,131 **** # Grab the messages # ! my $messages = $rule_ref->{rule}->{$rule_name}->{message}; if(ref($messages) eq "ARRAY") { ### for multiple values foreach my $subsystem (@{$messages}) { --- 131,135 ---- # Grab the messages # ! my $messages = $rule->{message}; if(ref($messages) eq "ARRAY") { ### for multiple values foreach my $subsystem (@{$messages}) { *************** *** 138,143 **** } ! my $alias = join ":", ($rule_ref->{rule}->{$rule_name}->{action}->{type}, ! $rule_ref->{rule}->{$rule_name}->{action}->{value}); $hash{action} = $self->parse_legacy_alias($alias); --- 142,147 ---- } ! my $alias = join ":", ($rule->{action}->{type}, ! $rule->{action}->{value}); $hash{action} = $self->parse_legacy_alias($alias); *************** *** 177,184 **** $s->trace("M ($identity) A10email opening xml $filename...", 3); ! my $ref = $xs->XMLin($filename); ! foreach my $rule_name (keys %{$ref->{rule}}) { ! push @rules, $self->parse_xml_rule_block($rule_name, $ref); } --- 181,188 ---- $s->trace("M ($identity) A10email opening xml $filename...", 3); ! my $ref = $xs->XMLin($filename, KeyAttr => "rule"); ! foreach my $rule (@{$ref->{rule}}) { ! push @rules, $self->parse_xml_rule_block($rule, $ref); } *************** *** 400,404 **** my $alertlist = $queue->sorted_href_alert_list(); $s->trace("M ($identity) A10email action handler begins...",3); ! my $filename = $s->ServerRoot."/etc/email.conf"; --- 404,408 ---- my $alertlist = $queue->sorted_href_alert_list(); $s->trace("M ($identity) A10email action handler begins...",3); ! my $filename = $s->ServerRoot."/etc/email.xml"; *************** *** 406,410 **** # Populate a list of rules. (prime the pump) # ! if(($rules = $self->parse_legacy_file($filename, $t)) == -1) { $s->log("M ($identity) File $filename not found!", FATAL); } --- 410,414 ---- # Populate a list of rules. (prime the pump) # ! if(($rules = $self->parse_xml_file($filename, $t)) == -1) { $s->log("M ($identity) File $filename not found!", FATAL); } |
|
From: Bob T. <bt...@us...> - 2004-03-30 18:34:56
|
Update of /cvsroot/benson/benson3/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25021 Modified Files: Makefile.in Removed Files: rules.conf.tmpl Log Message: Removed the rules.conf file. Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/conf/Makefile.in,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** Makefile.in 19 Mar 2004 05:37:14 -0000 1.13 --- Makefile.in 30 Mar 2004 18:23:16 -0000 1.14 *************** *** 16,20 **** LDFLAGS=-L. @LDFLAGS@ ! TARGETS=benson.conf apache.conf email.conf diskmon.conf rules.conf procmon.conf autoack.conf --- 16,20 ---- LDFLAGS=-L. @LDFLAGS@ ! TARGETS=benson.conf apache.conf email.conf diskmon.conf procmon.conf autoack.conf *************** *** 33,39 **** cat diskmon.conf.tmpl > diskmon.conf - rules.conf: rules.conf.tmpl - cat rules.conf.tmpl > rules.conf - procmon.conf: procmon.conf.tmpl cat procmon.conf.tmpl > procmon.conf --- 33,36 ---- --- rules.conf.tmpl DELETED --- |
|
From: Bob T. <bt...@us...> - 2004-03-20 04:38:42
|
Update of /cvsroot/benson/benson3/doc/htdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22218/doc/htdocs Modified Files: Makefile.in Log Message: Added some more web page docs. Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/doc/htdocs/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Makefile.in 19 Mar 2004 05:37:15 -0000 1.2 --- Makefile.in 20 Mar 2004 04:28:46 -0000 1.3 *************** *** 18,21 **** --- 18,22 ---- $(top_srcdir)/mkinstalldirs $(webdir)/html $(top_srcdir)/mkinstalldirs $(webdir)/html/images + $(top_srcdir)/mkinstalldirs $(webdir)/html/errors cp -rp images/* $(webdir)/html/images/ |
|
From: Bob T. <bt...@us...> - 2004-03-19 06:09:45
|
Update of /cvsroot/benson/benson3/doc/htdocs/errors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6046/errors Log Message: Directory /cvsroot/benson/benson3/doc/htdocs/errors added to the repository |
|
From: Bob T. <bt...@us...> - 2004-03-19 05:46:59
|
Update of /cvsroot/benson/benson3/doc/htdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2323/doc/htdocs Modified Files: Makefile.in Log Message: Added some good apache stuff to benson. Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/doc/htdocs/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Makefile.in 13 Nov 2002 04:28:05 -0000 1.1 --- Makefile.in 19 Mar 2004 05:37:15 -0000 1.2 *************** *** 1,302 **** ! # Makefile.in generated automatically by automake 1.4 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. ! # This Makefile.in is free software; the Free Software Foundation ! # gives unlimited permission to copy and/or distribute it, ! # with or without modifications, as long as this notice is preserved. ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY, to the extent permitted by law; without ! # even the implied warranty of MERCHANTABILITY or FITNESS FOR A ! # PARTICULAR PURPOSE. - - SHELL = @SHELL@ - - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - - DESTDIR = - - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - - top_builddir = ../.. - - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - transform = @program_transform_name@ - - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : - host_alias = @host_alias@ - host_triplet = @host@ - AS = @AS@ - CC = @CC@ - DLLTOOL = @DLLTOOL@ - ECHO = @ECHO@ - EXEEXT = @EXEEXT@ - HAVE_X11 = @HAVE_X11@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_DEPS = @LIBTOOL_DEPS@ - LIBTOOL_VERSION = @LIBTOOL_VERSION@ - LN_S = @LN_S@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PERL_CFLAGS = @PERL_CFLAGS@ - PERL_LDFLAGS = @PERL_LDFLAGS@ - RANLIB = @RANLIB@ - STRIP = @STRIP@ - VERSION = @VERSION@ - perlpath = @perlpath@ - pythonpath = @pythonpath@ - sedpath = @sedpath@ - sortpath = @sortpath@ - tclpath = @tclpath@ - trpath = @trpath@ - uniqpath = @uniqpath@ - - SUBDIRS = images - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../config.h - CONFIG_CLEAN_FILES = - DIST_COMMON = Makefile.am Makefile.in - - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - - TAR = tar - GZIP_ENV = --best - all: all-redirect - .SUFFIXES: - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/htdocs/Makefile - - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - - # This directory's subdirectories are mostly independent; you can cd - # into them and run `make' without going through this Makefile. - # To change the values of `make' variables: instead of editing Makefiles, - # (1) if the variable is set in `config.status', edit `config.status' - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - - @SET_MAKE@ - - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive info-recursive dvi-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - - mostlyclean-recursive clean-recursive distclean-recursive \ - maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" = "." && dot_seen=yes; \ - done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done - - tags: TAGS - - ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) - - mostlyclean-tags: - - clean-tags: - - distclean-tags: - -rm -f TAGS ID - - maintainer-clean-tags: - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - - subdir = doc/htdocs - - distdir: $(DISTFILES) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(top_distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/htdocs/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done - for subdir in $(SUBDIRS); do \ - if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ - || exit 1; \ - fi; \ - done - info-am: - info: info-recursive - dvi-am: - dvi: dvi-recursive - check-am: all-am - check: check-recursive - installcheck-am: - installcheck: installcheck-recursive - install-exec-am: - install-exec: install-exec-recursive - - install-data-am: - install-data: install-data-recursive - - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - install: install-recursive - uninstall-am: - uninstall: uninstall-recursive - all-am: Makefile - all-redirect: all-recursive - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: installdirs-recursive - installdirs-am: - - - mostlyclean-generic: - - clean-generic: - - distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: - mostlyclean-am: mostlyclean-tags mostlyclean-generic - - mostlyclean: mostlyclean-recursive - - clean-am: clean-tags clean-generic mostlyclean-am - - clean: clean-recursive - - distclean-am: distclean-tags distclean-generic clean-am - -rm -f libtool - - distclean: distclean-recursive - - maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - - maintainer-clean: maintainer-clean-recursive - - .PHONY: install-data-recursive uninstall-data-recursive \ - install-exec-recursive uninstall-exec-recursive installdirs-recursive \ - uninstalldirs-recursive all-recursive check-recursive \ - installcheck-recursive info-recursive dvi-recursive \ - mostlyclean-recursive distclean-recursive clean-recursive \ - maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ - distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ - dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ - install-exec install-data-am install-data install-am install \ - uninstall-am uninstall all-redirect all-am all installdirs-am \ - installdirs mostlyclean-generic distclean-generic clean-generic \ - maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: --- 1,26 ---- ! prefix=@prefix@ ! perlpath=@perlpath@ ! exec_prefix=@exec_prefix@ ! webdir=@prefix@/web/ ! cgibindir=@prefix@/web/cgi-bin/ ! srcdir=@srcdir@ ! top_srcdir=@top_srcdir@ ! ! TARGETS=make-images ! ! all: $(TARGETS) ! ! make-images: ! ! install: ! $(top_srcdir)/mkinstalldirs $(webdir) ! $(top_srcdir)/mkinstalldirs $(webdir)/logs ! $(top_srcdir)/mkinstalldirs $(webdir)/html ! $(top_srcdir)/mkinstalldirs $(webdir)/html/images ! cp -rp images/* $(webdir)/html/images/ ! clean: ! distclean: clean ! rm -f Makefile *~ |
|
From: Bob T. <bt...@us...> - 2004-03-19 05:46:59
|
Update of /cvsroot/benson/benson3/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2323/doc Modified Files: Makefile.in Log Message: Added some good apache stuff to benson. Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/doc/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Makefile.in 13 Nov 2002 04:28:05 -0000 1.1 --- Makefile.in 19 Mar 2004 05:37:15 -0000 1.2 *************** *** 1,302 **** ! # Makefile.in generated automatically by automake 1.4 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. ! # This Makefile.in is free software; the Free Software Foundation ! # gives unlimited permission to copy and/or distribute it, ! # with or without modifications, as long as this notice is preserved. ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY, to the extent permitted by law; without ! # even the implied warranty of MERCHANTABILITY or FITNESS FOR A ! # PARTICULAR PURPOSE. ! SHELL = @SHELL@ ! srcdir = @srcdir@ ! top_srcdir = @top_srcdir@ ! VPATH = @srcdir@ ! prefix = @prefix@ ! exec_prefix = @exec_prefix@ - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - - DESTDIR = - - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - - top_builddir = .. - - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - transform = @program_transform_name@ - - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : - host_alias = @host_alias@ - host_triplet = @host@ - AS = @AS@ - CC = @CC@ - DLLTOOL = @DLLTOOL@ - ECHO = @ECHO@ - EXEEXT = @EXEEXT@ - HAVE_X11 = @HAVE_X11@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_DEPS = @LIBTOOL_DEPS@ - LIBTOOL_VERSION = @LIBTOOL_VERSION@ - LN_S = @LN_S@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PERL_CFLAGS = @PERL_CFLAGS@ - PERL_LDFLAGS = @PERL_LDFLAGS@ - RANLIB = @RANLIB@ - STRIP = @STRIP@ - VERSION = @VERSION@ - perlpath = @perlpath@ - pythonpath = @pythonpath@ - sedpath = @sedpath@ - sortpath = @sortpath@ - tclpath = @tclpath@ - trpath = @trpath@ - uniqpath = @uniqpath@ - - SUBDIRS = htdocs - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = - DIST_COMMON = Makefile.am Makefile.in - - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - - TAR = tar - GZIP_ENV = --best - all: all-redirect - .SUFFIXES: - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile - - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - - # This directory's subdirectories are mostly independent; you can cd - # into them and run `make' without going through this Makefile. - # To change the values of `make' variables: instead of editing Makefiles, - # (1) if the variable is set in `config.status', edit `config.status' - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - - @SET_MAKE@ - - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive info-recursive dvi-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - - mostlyclean-recursive clean-recursive distclean-recursive \ - maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" = "." && dot_seen=yes; \ - done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done - - tags: TAGS - - ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) - - mostlyclean-tags: - - clean-tags: - - distclean-tags: - -rm -f TAGS ID - - maintainer-clean-tags: - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - - subdir = doc - - distdir: $(DISTFILES) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(top_distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done - for subdir in $(SUBDIRS); do \ - if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ - || exit 1; \ - fi; \ - done - info-am: - info: info-recursive - dvi-am: - dvi: dvi-recursive - check-am: all-am - check: check-recursive - installcheck-am: - installcheck: installcheck-recursive - install-exec-am: - install-exec: install-exec-recursive - - install-data-am: - install-data: install-data-recursive - - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - install: install-recursive - uninstall-am: - uninstall: uninstall-recursive - all-am: Makefile - all-redirect: all-recursive - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: installdirs-recursive - installdirs-am: - - - mostlyclean-generic: - - clean-generic: - - distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: - mostlyclean-am: mostlyclean-tags mostlyclean-generic - - mostlyclean: mostlyclean-recursive - - clean-am: clean-tags clean-generic mostlyclean-am - - clean: clean-recursive - - distclean-am: distclean-tags distclean-generic clean-am - -rm -f libtool - - distclean: distclean-recursive - - maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - - maintainer-clean: maintainer-clean-recursive - - .PHONY: install-data-recursive uninstall-data-recursive \ - install-exec-recursive uninstall-exec-recursive installdirs-recursive \ - uninstalldirs-recursive all-recursive check-recursive \ - installcheck-recursive info-recursive dvi-recursive \ - mostlyclean-recursive distclean-recursive clean-recursive \ - maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ - distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ - dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ - install-exec install-data-am install-data install-am install \ - uninstall-am uninstall all-redirect all-am all installdirs-am \ - installdirs mostlyclean-generic distclean-generic clean-generic \ - maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: --- 1,17 ---- ! TARGETS=make-htdocs ! all: $(TARGETS) ! make-htdocs: ! (cd htdocs && $(MAKE)) + install: + (cd htdocs && $(MAKE) install) ! clean: ! (cd htdocs && $(MAKE) clean) ! distclean: clean ! (cd htdocs && $(MAKE) distclean) ! rm -f Makefile *~ |
|
From: Bob T. <bt...@us...> - 2004-03-19 05:46:59
|
Update of /cvsroot/benson/benson3/scripts/cgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2323/scripts/cgi Modified Files: Makefile.in Log Message: Added some good apache stuff to benson. Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/scripts/cgi/Makefile.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** Makefile.in 30 Nov 2003 00:42:15 -0000 1.8 --- Makefile.in 19 Mar 2004 05:37:15 -0000 1.9 *************** *** 2,6 **** perlpath=@perlpath@ exec_prefix=@exec_prefix@ ! bindir=@bindir@ srcdir=@srcdir@ top_srcdir=@top_srcdir@ --- 2,7 ---- perlpath=@perlpath@ exec_prefix=@exec_prefix@ ! webdir=@prefix@/web/ ! cgibindir=@prefix@/web/cgi-bin/ srcdir=@srcdir@ top_srcdir=@top_srcdir@ *************** *** 39,46 **** install: $(TARGETS) ! $(top_srcdir)/mkinstalldirs $(bindir) ! $(INSTALL) -m 0755 alertview.cgi $(bindir) ! $(INSTALL) -m 0755 alertlist.cgi $(bindir) ! $(INSTALL) -m 0755 suppress.cgi $(bindir) clean: --- 40,48 ---- install: $(TARGETS) ! $(top_srcdir)/mkinstalldirs $(webdir) ! $(top_srcdir)/mkinstalldirs $(cgibindir) ! $(INSTALL) -m 0755 alertview.cgi $(cgibindir) ! $(INSTALL) -m 0755 alertlist.cgi $(cgibindir) ! $(INSTALL) -m 0755 suppress.cgi $(cgibindir) clean: |
|
From: Bob T. <bt...@us...> - 2004-03-19 05:46:58
|
Update of /cvsroot/benson/benson3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2323 Modified Files: Makefile.in Log Message: Added some good apache stuff to benson. Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/Makefile.in,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** Makefile.in 19 Feb 2004 02:41:40 -0000 1.17 --- Makefile.in 19 Mar 2004 05:37:14 -0000 1.18 *************** *** 1,3 **** ! TARGETS=make-src make-conf make-scripts make-handlers all: $(TARGETS) --- 1,3 ---- ! TARGETS=make-src make-doc make-conf make-scripts make-handlers all: $(TARGETS) *************** *** 6,9 **** --- 6,12 ---- (cd src && $(MAKE)) + make-doc: + (cd doc && $(MAKE)) + make-conf: (cd conf && $(MAKE)) |
|
From: Bob T. <bt...@us...> - 2004-03-19 05:46:58
|
Update of /cvsroot/benson/benson3/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2323/conf Modified Files: Makefile.in Added Files: apache.conf.tmpl Log Message: Added some good apache stuff to benson. --- NEW FILE: apache.conf.tmpl --- # # Benson Configuration for the Apache Web Server # <VirtualHost _default_:80> ServerAdmin web...@ne... DocumentRoot prefixpath/web/html ServerName benson.newportal.com ScriptAlias /cgi-bin/ "prefixpath/web/cgi-bin/" ErrorLog prefixpath/web/logs/error_log CustomLog prefixpath/web/logs/access_log combined </VirtualHost> Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/conf/Makefile.in,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** Makefile.in 19 Mar 2004 04:37:59 -0000 1.12 --- Makefile.in 19 Mar 2004 05:37:14 -0000 1.13 *************** *** 16,20 **** LDFLAGS=-L. @LDFLAGS@ ! TARGETS=benson.conf email.conf diskmon.conf rules.conf procmon.conf autoack.conf --- 16,20 ---- LDFLAGS=-L. @LDFLAGS@ ! TARGETS=benson.conf apache.conf email.conf diskmon.conf rules.conf procmon.conf autoack.conf *************** *** 44,53 **** install: $(TARGETS) $(top_srcdir)/mkinstalldirs $(sysconfdir) ! $(INSTALL) -m 0644 benson.conf $(sysconfdir) ! $(INSTALL) -m 0644 email.conf $(sysconfdir) ! $(INSTALL) -m 0644 diskmon.conf $(sysconfdir) ! $(INSTALL) -m 0644 rules.conf $(sysconfdir) ! $(INSTALL) -m 0644 procmon.conf $(sysconfdir) ! $(INSTALL) -m 0644 autoack.conf $(sysconfdir) clean: --- 44,83 ---- install: $(TARGETS) $(top_srcdir)/mkinstalldirs $(sysconfdir) ! if [ ! -f "$(sysconfdir)/benson.conf" ]; then \ ! $(INSTALL) -m 0644 benson.conf $(sysconfdir); \ ! else \ ! echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/benson.conf]"; \ ! fi; \ ! if [ ! -f "$(sysconfdir)/email.conf" ]; then \ ! $(INSTALL) -m 0644 email.conf $(sysconfdir); \ ! else \ ! echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/email.conf]"; \ ! fi; \ ! if [ ! -f "$(sysconfdir)/diskmon.conf" ]; then \ ! $(INSTALL) -m 0644 diskmon.conf $(sysconfdir); \ ! else \ ! echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/diskmon.conf]"; \ ! fi; \ ! if [ ! -f "$(sysconfdir)/rules.conf" ]; then \ ! $(INSTALL) -m 0644 rules.conf $(sysconfdir); \ ! else \ ! echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/rules.conf]"; \ ! fi; \ ! if [ ! -f "$(sysconfdir)/procmon.conf" ]; then \ ! $(INSTALL) -m 0644 procmon.conf $(sysconfdir); \ ! else \ ! echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/procmon.conf]"; \ ! fi; \ ! if [ ! -f "$(sysconfdir)/autoack.conf" ]; then \ ! $(INSTALL) -m 0644 autoack.conf $(sysconfdir); \ ! else \ ! echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/autoack.conf]"; \ ! fi; \ ! if [ ! -f "$(sysconfdir)/apache.conf" ]; then \ ! $(INSTALL) -m 0644 apache.conf $(sysconfdir); \ ! else \ ! echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/apache.conf]"; \ ! fi; \ ! exit; clean: |
|
From: Bob T. <bt...@us...> - 2004-03-19 04:47:43
|
Update of /cvsroot/benson/benson3/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26767 Modified Files: Makefile.in Removed Files: Makefile.am Log Message: Removed the automake file. Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/conf/Makefile.in,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** Makefile.in 30 Sep 2003 03:18:02 -0000 1.11 --- Makefile.in 19 Mar 2004 04:37:59 -0000 1.12 *************** *** 24,27 **** --- 24,30 ---- sed -e "s:prefixpath:@prefix@:" benson.conf.tmpl > benson.conf + apache.conf: apache.conf.tmpl + sed -e "s:prefixpath:@prefix@:" apache.conf.tmpl > apache.conf + email.conf: email.conf.tmpl cat email.conf.tmpl > email.conf --- Makefile.am DELETED --- |
|
From: Bob T. <bt...@us...> - 2004-03-01 22:39:40
|
Update of /cvsroot/benson/benson3/autom4te.cache In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27033/autom4te.cache Modified Files: requests Log Message: Made the changes for the historical handler and tests. Index: requests =================================================================== RCS file: /cvsroot/benson/benson3/autom4te.cache/requests,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** requests 19 Feb 2004 01:59:03 -0000 1.22 --- requests 1 Mar 2004 22:28:14 -0000 1.23 *************** *** 17,33 **** { 'm4_pattern_forbid' => 1, - 'AC_C_VOLATILE' => 1, 'AC_TYPE_OFF_T' => 1, 'AC_FUNC_CLOSEDIR_VOID' => 1, 'AC_REPLACE_FNMATCH' => 1, 'AC_PROG_LIBTOOL' => 1, 'AC_FUNC_STAT' => 1, - 'AC_FUNC_WAIT3' => 1, 'AC_HEADER_TIME' => 1, ! 'AC_FUNC_LSTAT' => 1, ! 'AC_STRUCT_TM' => 1, 'AM_AUTOMAKE_VERSION' => 1, ! 'AC_FUNC_GETMNTENT' => 1, 'AC_TYPE_MODE_T' => 1, 'AC_FUNC_STRTOD' => 1, 'AC_CHECK_HEADERS' => 1, --- 17,33 ---- { 'm4_pattern_forbid' => 1, 'AC_TYPE_OFF_T' => 1, + 'AC_C_VOLATILE' => 1, 'AC_FUNC_CLOSEDIR_VOID' => 1, 'AC_REPLACE_FNMATCH' => 1, 'AC_PROG_LIBTOOL' => 1, 'AC_FUNC_STAT' => 1, 'AC_HEADER_TIME' => 1, ! 'AC_FUNC_WAIT3' => 1, 'AM_AUTOMAKE_VERSION' => 1, ! 'AC_STRUCT_TM' => 1, ! 'AC_FUNC_LSTAT' => 1, 'AC_TYPE_MODE_T' => 1, + 'AC_FUNC_GETMNTENT' => 1, 'AC_FUNC_STRTOD' => 1, 'AC_CHECK_HEADERS' => 1, *************** *** 52,59 **** 'AC_FUNC_STRERROR_R' => 1, 'AC_PROG_CC' => 1, - 'AC_FUNC_FORK' => 1, 'AC_DECL_SYS_SIGLIST' => 1, ! 'AC_FUNC_STRCOLL' => 1, 'AC_FUNC_VPRINTF' => 1, 'AC_PROG_YACC' => 1, 'AC_INIT' => 1, --- 52,59 ---- 'AC_FUNC_STRERROR_R' => 1, 'AC_PROG_CC' => 1, 'AC_DECL_SYS_SIGLIST' => 1, ! 'AC_FUNC_FORK' => 1, 'AC_FUNC_VPRINTF' => 1, + 'AC_FUNC_STRCOLL' => 1, 'AC_PROG_YACC' => 1, 'AC_INIT' => 1, *************** *** 80,86 **** 'AC_C_INLINE' => 1, 'AC_PROG_CPP' => 1, - 'AC_TYPE_PID_T' => 1, - 'AC_PROG_LEX' => 1, 'AC_C_CONST' => 1, 'AC_CONFIG_FILES' => 1, 'include' => 1, --- 80,86 ---- 'AC_C_INLINE' => 1, 'AC_PROG_CPP' => 1, 'AC_C_CONST' => 1, + 'AC_PROG_LEX' => 1, + 'AC_TYPE_PID_T' => 1, 'AC_CONFIG_FILES' => 1, 'include' => 1, *************** *** 88,93 **** 'AC_PROG_INSTALL' => 1, 'AM_GNU_GETTEXT' => 1, - 'AC_CHECK_LIB' => 1, 'AC_FUNC_OBSTACK' => 1, 'AC_FUNC_MALLOC' => 1, 'AC_FUNC_GETGROUPS' => 1, --- 88,93 ---- 'AC_PROG_INSTALL' => 1, 'AM_GNU_GETTEXT' => 1, 'AC_FUNC_OBSTACK' => 1, + 'AC_CHECK_LIB' => 1, 'AC_FUNC_MALLOC' => 1, 'AC_FUNC_GETGROUPS' => 1, *************** *** 96,106 **** 'AC_FUNC_FSEEKO' => 1, 'AM_PROG_CC_C_O' => 1, - 'AC_FUNC_MKTIME' => 1, - 'AC_CANONICAL_SYSTEM' => 1, 'AM_CONDITIONAL' => 1, 'AC_CONFIG_HEADERS' => 1, 'AC_HEADER_SYS_WAIT' => 1, - 'AC_PROG_LN_S' => 1, 'AC_FUNC_MEMCMP' => 1, 'm4_include' => 1, 'AC_HEADER_DIRENT' => 1, --- 96,106 ---- 'AC_FUNC_FSEEKO' => 1, 'AM_PROG_CC_C_O' => 1, 'AM_CONDITIONAL' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AC_FUNC_MKTIME' => 1, 'AC_CONFIG_HEADERS' => 1, 'AC_HEADER_SYS_WAIT' => 1, 'AC_FUNC_MEMCMP' => 1, + 'AC_PROG_LN_S' => 1, 'm4_include' => 1, 'AC_HEADER_DIRENT' => 1, *************** *** 121,137 **** { 'm4_pattern_forbid' => 1, - 'AC_C_VOLATILE' => 1, 'AC_TYPE_OFF_T' => 1, 'AC_FUNC_CLOSEDIR_VOID' => 1, 'AC_REPLACE_FNMATCH' => 1, 'AC_PROG_LIBTOOL' => 1, 'AC_FUNC_STAT' => 1, - 'AC_FUNC_WAIT3' => 1, 'AC_HEADER_TIME' => 1, ! 'AC_FUNC_LSTAT' => 1, ! 'AC_STRUCT_TM' => 1, 'AM_AUTOMAKE_VERSION' => 1, ! 'AC_FUNC_GETMNTENT' => 1, 'AC_TYPE_MODE_T' => 1, 'AC_FUNC_STRTOD' => 1, 'AC_CHECK_HEADERS' => 1, --- 121,137 ---- { 'm4_pattern_forbid' => 1, 'AC_TYPE_OFF_T' => 1, + 'AC_C_VOLATILE' => 1, 'AC_FUNC_CLOSEDIR_VOID' => 1, 'AC_REPLACE_FNMATCH' => 1, 'AC_PROG_LIBTOOL' => 1, 'AC_FUNC_STAT' => 1, 'AC_HEADER_TIME' => 1, ! 'AC_FUNC_WAIT3' => 1, 'AM_AUTOMAKE_VERSION' => 1, ! 'AC_STRUCT_TM' => 1, ! 'AC_FUNC_LSTAT' => 1, 'AC_TYPE_MODE_T' => 1, + 'AC_FUNC_GETMNTENT' => 1, 'AC_FUNC_STRTOD' => 1, 'AC_CHECK_HEADERS' => 1, *************** *** 156,163 **** 'AC_FUNC_STRERROR_R' => 1, 'AC_PROG_CC' => 1, - 'AC_FUNC_FORK' => 1, 'AC_DECL_SYS_SIGLIST' => 1, ! 'AC_FUNC_STRCOLL' => 1, 'AC_FUNC_VPRINTF' => 1, 'AC_PROG_YACC' => 1, 'AC_INIT' => 1, --- 156,163 ---- 'AC_FUNC_STRERROR_R' => 1, 'AC_PROG_CC' => 1, 'AC_DECL_SYS_SIGLIST' => 1, ! 'AC_FUNC_FORK' => 1, 'AC_FUNC_VPRINTF' => 1, + 'AC_FUNC_STRCOLL' => 1, 'AC_PROG_YACC' => 1, 'AC_INIT' => 1, *************** *** 184,190 **** 'AC_C_INLINE' => 1, 'AC_PROG_CPP' => 1, - 'AC_TYPE_PID_T' => 1, - 'AC_PROG_LEX' => 1, 'AC_C_CONST' => 1, 'AC_CONFIG_FILES' => 1, 'include' => 1, --- 184,190 ---- 'AC_C_INLINE' => 1, 'AC_PROG_CPP' => 1, 'AC_C_CONST' => 1, + 'AC_PROG_LEX' => 1, + 'AC_TYPE_PID_T' => 1, 'AC_CONFIG_FILES' => 1, 'include' => 1, *************** *** 192,197 **** 'AC_PROG_INSTALL' => 1, 'AM_GNU_GETTEXT' => 1, - 'AC_CHECK_LIB' => 1, 'AC_FUNC_OBSTACK' => 1, 'AC_FUNC_MALLOC' => 1, 'AC_FUNC_GETGROUPS' => 1, --- 192,197 ---- 'AC_PROG_INSTALL' => 1, 'AM_GNU_GETTEXT' => 1, 'AC_FUNC_OBSTACK' => 1, + 'AC_CHECK_LIB' => 1, 'AC_FUNC_MALLOC' => 1, 'AC_FUNC_GETGROUPS' => 1, *************** *** 200,210 **** 'AC_FUNC_FSEEKO' => 1, 'AM_PROG_CC_C_O' => 1, - 'AC_FUNC_MKTIME' => 1, - 'AC_CANONICAL_SYSTEM' => 1, 'AM_CONDITIONAL' => 1, 'AC_CONFIG_HEADERS' => 1, 'AC_HEADER_SYS_WAIT' => 1, 'AC_PROG_LN_S' => 1, 'AC_FUNC_MEMCMP' => 1, 'm4_include' => 1, 'AC_HEADER_DIRENT' => 1, --- 200,314 ---- 'AC_FUNC_FSEEKO' => 1, 'AM_PROG_CC_C_O' => 1, 'AM_CONDITIONAL' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AC_FUNC_MKTIME' => 1, 'AC_CONFIG_HEADERS' => 1, 'AC_HEADER_SYS_WAIT' => 1, + 'AC_FUNC_MEMCMP' => 1, 'AC_PROG_LN_S' => 1, + 'm4_include' => 1, + 'AC_HEADER_DIRENT' => 1, + 'AC_CHECK_FUNCS' => 1 + } + ], 'Request' ), + bless( [ + '2', + 1, + [ + '/usr/share/autoconf' + ], + [ + '/usr/share/autoconf/autoconf/autoconf.m4f', + 'aclocal.m4', + 'configure.ac' + ], + { + 'm4_pattern_forbid' => 1, + 'AC_TYPE_OFF_T' => 1, + 'AC_C_VOLATILE' => 1, + 'AC_FUNC_CLOSEDIR_VOID' => 1, + 'AC_REPLACE_FNMATCH' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'AC_FUNC_STAT' => 1, + 'AC_HEADER_TIME' => 1, + 'AC_FUNC_WAIT3' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AC_STRUCT_TM' => 1, + 'AC_FUNC_LSTAT' => 1, + 'AC_TYPE_MODE_T' => 1, + 'AC_FUNC_GETMNTENT' => 1, + 'AC_FUNC_STRTOD' => 1, + 'AC_CHECK_HEADERS' => 1, + 'AC_FUNC_STRNLEN' => 1, + 'AC_PROG_CXX' => 1, + 'AC_PATH_X' => 1, + 'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1, + 'AC_PROG_AWK' => 1, + 'AC_HEADER_STDC' => 1, + 'AC_HEADER_MAJOR' => 1, + 'AC_FUNC_ERROR_AT_LINE' => 1, + 'AC_PROG_GCC_TRADITIONAL' => 1, + 'AC_LIBSOURCE' => 1, + 'AC_FUNC_MBRTOWC' => 1, + 'AC_STRUCT_ST_BLOCKS' => 1, + 'AC_TYPE_SIGNAL' => 1, + 'AC_TYPE_UID_T' => 1, + 'AC_CONFIG_AUX_DIR' => 1, + 'AC_PROG_MAKE_SET' => 1, + 'm4_pattern_allow' => 1, + 'AC_DEFINE_TRACE_LITERAL' => 1, + 'AC_FUNC_STRERROR_R' => 1, + 'AC_PROG_CC' => 1, + 'AC_DECL_SYS_SIGLIST' => 1, + 'AC_FUNC_FORK' => 1, + 'AC_FUNC_VPRINTF' => 1, + 'AC_FUNC_STRCOLL' => 1, + 'AC_PROG_YACC' => 1, + 'AC_INIT' => 1, + 'AC_STRUCT_TIMEZONE' => 1, + 'AC_FUNC_CHOWN' => 1, + 'AC_SUBST' => 1, + 'AC_FUNC_ALLOCA' => 1, + 'AC_CANONICAL_HOST' => 1, + 'AC_FUNC_GETPGRP' => 1, + 'AC_PROG_RANLIB' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'AC_FUNC_SETPGRP' => 1, + 'AC_CONFIG_SUBDIRS' => 1, + 'AC_FUNC_MMAP' => 1, + 'AC_FUNC_REALLOC' => 1, + 'AC_TYPE_SIZE_T' => 1, + 'AC_CHECK_TYPES' => 1, + 'AC_CHECK_MEMBERS' => 1, + 'AM_MAINTAINER_MODE' => 1, + 'AC_FUNC_UTIME_NULL' => 1, + 'AC_FUNC_SELECT_ARGTYPES' => 1, + 'AC_FUNC_STRFTIME' => 1, + 'AC_HEADER_STAT' => 1, + 'AC_C_INLINE' => 1, + 'AC_PROG_CPP' => 1, + 'AC_C_CONST' => 1, + 'AC_PROG_LEX' => 1, + 'AC_TYPE_PID_T' => 1, + 'AC_CONFIG_FILES' => 1, + 'include' => 1, + 'AC_FUNC_SETVBUF_REVERSED' => 1, + 'AC_PROG_INSTALL' => 1, + 'AM_GNU_GETTEXT' => 1, + 'AC_FUNC_OBSTACK' => 1, + 'AC_CHECK_LIB' => 1, + 'AC_FUNC_MALLOC' => 1, + 'AC_FUNC_GETGROUPS' => 1, + 'AC_FUNC_GETLOADAVG' => 1, + 'AH_OUTPUT' => 1, + 'AC_FUNC_FSEEKO' => 1, + 'AM_PROG_CC_C_O' => 1, + 'AM_CONDITIONAL' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AC_FUNC_MKTIME' => 1, + 'AC_CONFIG_HEADERS' => 1, + 'AC_HEADER_SYS_WAIT' => 1, 'AC_FUNC_MEMCMP' => 1, + 'AC_PROG_LN_S' => 1, 'm4_include' => 1, 'AC_HEADER_DIRENT' => 1, |
|
From: Bob T. <bt...@us...> - 2004-03-01 22:39:40
|
Update of /cvsroot/benson/benson3/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27033/conf Modified Files: benson.conf.tmpl Log Message: Made the changes for the historical handler and tests. Index: benson.conf.tmpl =================================================================== RCS file: /cvsroot/benson/benson3/conf/benson.conf.tmpl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** benson.conf.tmpl 6 Jan 2003 16:46:09 -0000 1.12 --- benson.conf.tmpl 1 Mar 2004 22:28:15 -0000 1.13 *************** *** 97,100 **** --- 97,107 ---- WebserverURL http://changeme + # + # HistoricalOnline: <integer> (in days) + # Number of days to keep online in the alerts table, + # before moving to the alerts_history table. + # + HistoricalOnline 7 + #################################################### |
|
From: Bob T. <bt...@us...> - 2004-03-01 22:39:40
|
Update of /cvsroot/benson/benson3/handlers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27033/handlers Modified Files: R85historical.pm Log Message: Made the changes for the historical handler and tests. Index: R85historical.pm =================================================================== RCS file: /cvsroot/benson/benson3/handlers/R85historical.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** R85historical.pm 23 Feb 2004 16:10:38 -0000 1.2 --- R85historical.pm 1 Mar 2004 22:28:15 -0000 1.3 *************** *** 13,52 **** } - my $insert_into_historical = <<EOSQL; - INSERT INTO - alerts_historical - SELECT - * - FROM - alerts - WHERE - received > now() - interval '? days' - EOSQL - - my $select_max_historical = <<EOSQL; - SELECT - max(identity) - FROM - alerts_historical - EOSQL - my $delete_historical_from_alerts = <<EOSQL; - DELETE FROM - alerts - WHERE - identity < '?' - EOSQL - my $delete_historical_from_alerts_status_log = <<EOSQL; - DELETE FROM - alerts_status_log - WHERE - identity < '?' - EOSQL sub handler { my ($self, $s) = @_; $s->trace(" R85historical is running...",3); ! my $days_kept_online = $s->HistoricalDKO || "7"; # --- 13,23 ---- } sub handler { my ($self, $s) = @_; $s->trace(" R85historical is running...",3); ! my $days_kept_online = $s->HistoricalOnline || "7"; # *************** *** 62,65 **** --- 33,48 ---- # Move historical alerts to alerts_historical table # + my $insert_into_historical = <<EOSQL; + INSERT INTO + alerts_history + SELECT + * + FROM + alerts + WHERE + received < now() - interval '$days_kept_online days' + EOSQL + + $dbh->begin_work; my $sth = $dbh->prepare($insert_into_historical); if($sth eq undef) { *************** *** 67,72 **** return 1; } ! my $rc = $sth->execute($days_kept_online); if($rc eq undef) { return 1; } --- 50,56 ---- return 1; } ! my $rc = $sth->execute(); if($rc eq undef) { + $dbh->rollback; return 1; } *************** *** 78,84 **** --- 62,75 ---- # Get latest row inserted identity # + my $select_max_historical = <<EOSQL; + SELECT + max(identity) + FROM + alerts_history + EOSQL $sth = $dbh->prepare($select_max_historical); if($sth eq undef) { $s->log("(DBI error) select_max_historical prepare failed.", FATAL); + $dbh->rollback; return 1; } *************** *** 86,89 **** --- 77,81 ---- if($rc eq undef) { $s->log("(DBI error) select_max_historical execute failed.", FATAL); + $dbh->rollback; return 1; } *************** *** 91,138 **** if($row eq undef) { $s->log("(DBI error) last row not found.", FATAL); return 0; } my $latest_historical_row = $row->[0]; if($latest_historical_row eq undef) { return 0; } $s->trace("R85historical: latest_historical_row id ($latest_historical_row)", 4); # # Delete rows from alerts and alerts_status_log # $sth = $dbh->prepare($delete_historical_from_alerts); if($sth eq undef) { $s->log("(DBI error) delete_historical_from_alerts prepare failed.", FATAL); return 1; } ! $rc = $sth->execute($latest_historical_row); if($rc eq undef) { $s->log("(DBI error) delete_historical_from_alerts execute failed.", FATAL); return 1; } my $rows_processed = $sth->rows; if($rows_processed != $rows_inserted) { ! $s->log("(DBI error) rows being deleted is not equal to rows inserted, aborting.", FATAL); return 1; } $sth = $dbh->prepare($delete_historical_from_alerts_status_log); if($sth eq undef) { $s->log("(DBI error) delete_historical_from_alerts_status_log prepare failed.", FATAL); return 1; } ! $rc = $sth->execute($latest_historical_row); if($rc eq undef) { $s->log("(DBI error) delete_historical_from_alerts_status_log execute failed.", FATAL); return 1; } ! $rows_processed = $sth->rows; ! if($rows_processed != $rows_inserted) { ! $s->log("(DBI error) rows being deleted is not equal to rows inserted, aborting.", FATAL); ! return 1; ! } ! # # Disconnect from database --- 83,145 ---- if($row eq undef) { $s->log("(DBI error) last row not found.", FATAL); + $dbh->rollback; return 0; } my $latest_historical_row = $row->[0]; if($latest_historical_row eq undef) { + $dbh->rollback; return 0; } $s->trace("R85historical: latest_historical_row id ($latest_historical_row)", 4); + # # Delete rows from alerts and alerts_status_log # + my $delete_historical_from_alerts = <<EOSQL; + DELETE FROM + alerts + WHERE + identity <= '$latest_historical_row' + EOSQL $sth = $dbh->prepare($delete_historical_from_alerts); if($sth eq undef) { $s->log("(DBI error) delete_historical_from_alerts prepare failed.", FATAL); + $dbh->rollback; return 1; } ! $rc = $sth->execute(); if($rc eq undef) { $s->log("(DBI error) delete_historical_from_alerts execute failed.", FATAL); + $dbh->rollback; return 1; } my $rows_processed = $sth->rows; if($rows_processed != $rows_inserted) { ! $s->log("(DBI error) rows being deleted($rows_processed) is not equal to rows inserted, aborting.", FATAL); ! $dbh->rollback; return 1; } + my $delete_historical_from_alerts_status_log = <<EOSQL; + DELETE FROM + alerts_status_log + WHERE + identity <= '$latest_historical_row' + EOSQL $sth = $dbh->prepare($delete_historical_from_alerts_status_log); if($sth eq undef) { $s->log("(DBI error) delete_historical_from_alerts_status_log prepare failed.", FATAL); + $dbh->rollback; return 1; } ! $rc = $sth->execute(); if($rc eq undef) { $s->log("(DBI error) delete_historical_from_alerts_status_log execute failed.", FATAL); + $dbh->rollback; return 1; } ! $dbh->commit; # # Disconnect from database |
|
From: Bob T. <bt...@us...> - 2004-03-01 22:39:34
|
Update of /cvsroot/benson/benson3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27033 Modified Files: configure configure.ac Log Message: Made the changes for the historical handler and tests. Index: configure =================================================================== RCS file: /cvsroot/benson/benson3/configure,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -r1.67 -r1.68 *** configure 19 Feb 2004 01:59:02 -0000 1.67 --- configure 1 Mar 2004 22:28:14 -0000 1.68 *************** *** 5560,5564 **** #AC_CONFIG_FILES([Makefile include/Makefile src/Makefile]) ! ac_config_files="$ac_config_files Makefile man/Makefile handlers/Makefile conf/Makefile include/Makefile scripts/Makefile scripts/cgi/Makefile src/Makefile src/network/Makefile src/perl/Makefile src/rules/Makefile src/monitors/Makefile src/monitors/process/Makefile src/monitors/disk/Makefile src/tests/monitors/Makefile src/tests/network/Makefile src/tests/Makefile doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure --- 5560,5564 ---- #AC_CONFIG_FILES([Makefile include/Makefile src/Makefile]) ! ac_config_files="$ac_config_files Makefile man/Makefile handlers/Makefile conf/Makefile include/Makefile scripts/Makefile scripts/cgi/Makefile src/Makefile src/network/Makefile src/perl/Makefile src/rules/Makefile src/monitors/Makefile src/monitors/process/Makefile src/monitors/disk/Makefile src/tests/handlers/Makefile src/tests/monitors/Makefile src/tests/network/Makefile src/tests/Makefile doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure *************** *** 6102,6105 **** --- 6102,6106 ---- "src/monitors/process/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/monitors/process/Makefile" ;; "src/monitors/disk/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/monitors/disk/Makefile" ;; + "src/tests/handlers/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/tests/handlers/Makefile" ;; "src/tests/monitors/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/tests/monitors/Makefile" ;; "src/tests/network/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/tests/network/Makefile" ;; Index: configure.ac =================================================================== RCS file: /cvsroot/benson/benson3/configure.ac,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** configure.ac 19 Feb 2004 01:59:02 -0000 1.15 --- configure.ac 1 Mar 2004 22:28:14 -0000 1.16 *************** *** 186,189 **** src/network/Makefile src/perl/Makefile src/rules/Makefile \ src/monitors/Makefile src/monitors/process/Makefile src/monitors/disk/Makefile \ ! src/tests/monitors/Makefile src/tests/network/Makefile src/tests/Makefile \ doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile]) --- 186,190 ---- src/network/Makefile src/perl/Makefile src/rules/Makefile \ src/monitors/Makefile src/monitors/process/Makefile src/monitors/disk/Makefile \ ! src/tests/handlers/Makefile src/tests/monitors/Makefile src/tests/network/Makefile \ ! src/tests/Makefile \ doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile]) |
|
From: Bob T. <bt...@us...> - 2004-03-01 20:36:13
|
Update of /cvsroot/benson/benson3/src/tests/handlers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31814 Added Files: Makefile.in historical_handler_test.tmpl Log Message: Added the historical handler tests. --- NEW FILE: Makefile.in --- prefix=@prefix@ perlpath=@perlpath@ exec_prefix=@exec_prefix@ bindir=@bindir@ srcdir=@srcdir@ top_srcdir=@top_srcdir@ CC=@CC@ LD=@LD@ CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/src/perl @CFLAGS@ PERL_CFLAGS=@PERL_CFLAGS@ PERL_LDFLAGS=@PERL_LDFLAGS@ CPPFLAGS=@CPPFLAGS@ @DEFS@ LIBS=@LIBS@ AR=@arpath@ RANLIB=@RANLIB@ INSTALL=@INSTALL@ LDFLAGS=-L. @LDFLAGS@ TARGETS=historical_handler_test all: $(TARGETS) historical_handler_test: historical_handler_test.tmpl cat historical_handler_test.tmpl | sed -e "s:prefixpath:@prefix@:" \ | sed -e "s:perlpath:@perlpath@:" > historical_handler_test chmod 700 historical_handler_test clean: rm -f historical_handler_test distclean: clean rm -f Makefile *~ --- NEW FILE: historical_handler_test.tmpl --- #!perlpath -Iprefixpath/lib/perl use DBI; use Benson; use POSIX; my $benson = new Benson; my $current_time = time(); my $start_time = $current_time - (30 * (24 * (60*60))); my $present = POSIX::strftime("%Y-%m-%d_%H:%M:%S", localtime($current_time)); my $past = POSIX::strftime("%Y-%m-%d_%H:%M:%S", localtime($current_time)); print <<EOT; TESTING: R85historical handler 1) Populating database with 30 days of alerts (one alert per hour, per day). 2) Run R85historical handler 3) Verify results Starting phase 1.... General Information: Current time: $present Historical time: $past EOT my $dbh = DBI->connect($benson->DBIConnectString, $benson->DBIUsername, $benson->DBIPassword); my $ctr = 0; while($start_time < $current_time) { my $recv_time = POSIX::strftime("%Y-%m-%d_%H:%M:%S", localtime($start_time)); my $sql = <<EOSQL; INSERT INTO alerts (identity, destination, agent, severity, subsystem, message, received, status) VALUES ('$start_time.test.1', 'localhost', 'localhost', 'informational', 'historical_test', 'testing $ctr', to_timestamp('$recv_time','yyyy-mm-dd_HH24:MI:SS'), 'acknowledged') EOSQL my $sth = $dbh->prepare($sql); $sth->execute(); $ctr++; $start_time += 3600; } $dbh->disconnect(); print <<EOT; Rows inserted: $ctr Starting phase 2.... EOT my $handler_wrapper = "prefixpath/bin/handler_wrapper"; my $handler_type = "--handler_type=rule"; my $handler_path = "--handler_path=prefixpath/handlers/"; my $handler = "--handler=R85historical.pm"; system($handler_wrapper,$handler_type,$handler_path,$handler); # # Yeah, yeah, I know this sucks, it'll get better. # print <<EOT; Starting phase 3.... Rows inserted should be: 720 Rows deleted/moved/inserted should be: 533 EOT |
