mon-commit Mailing List for mon (Page 10)
Brought to you by:
trockij
Menu
▾
▴
mon-commit — cvs commit messages
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(36) |
Jul
(21) |
Aug
(9) |
Sep
(1) |
Oct
(2) |
Nov
(12) |
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(4) |
Feb
(10) |
Mar
(5) |
Apr
(22) |
May
(17) |
Jun
(3) |
Jul
(4) |
Aug
(10) |
Sep
(2) |
Oct
(1) |
Nov
(2) |
Dec
(2) |
| 2006 |
Jan
|
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
(6) |
Oct
|
Nov
|
Dec
(2) |
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
(22) |
Jun
(19) |
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2008 |
Jan
(1) |
Feb
(1) |
Mar
(3) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(7) |
Nov
(1) |
Dec
|
| 2009 |
Jan
(2) |
Feb
(9) |
Mar
(1) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(5) |
| 2010 |
Jan
(2) |
Feb
(1) |
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
(2) |
Apr
(1) |
May
(2) |
Jun
(2) |
Jul
(65) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Jim T. <tr...@us...> - 2005-04-17 07:42:37
|
Update of /cvsroot/mon/mon/mon.d In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4889/mon.d Modified Files: fping.monitor freespace.monitor imap.monitor nntp.monitor ping.monitor pop3.monitor seq.monitor smtp.monitor tcp.monitor telnet.monitor Log Message: updated email addr Index: smtp.monitor =================================================================== RCS file: /cvsroot/mon/mon/mon.d/smtp.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** smtp.monitor 9 Jun 2004 05:18:04 -0000 1.1.1.1 --- smtp.monitor 17 Apr 2005 07:42:27 -0000 1.2 *************** *** 9,13 **** # # Adapted from "http.monitor" by ! # Jim Trocki, tr...@tr... # # http.monitor written by --- 9,13 ---- # # Adapted from "http.monitor" by ! # Jim Trocki, tr...@ar... # # http.monitor written by Index: ping.monitor =================================================================== RCS file: /cvsroot/mon/mon/mon.d/ping.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ping.monitor 9 Jun 2004 05:18:04 -0000 1.1.1.1 --- ping.monitor 17 Apr 2005 07:42:27 -0000 1.2 *************** *** 3,7 **** # Return a list of hosts which not reachable via ICMP echo # ! # Jim Trocki, tr...@tr... # # $Id$ --- 3,7 ---- # Return a list of hosts which not reachable via ICMP echo # ! # Jim Trocki, tr...@ar... # # $Id$ Index: telnet.monitor =================================================================== RCS file: /cvsroot/mon/mon/mon.d/telnet.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** telnet.monitor 9 Jun 2004 05:18:04 -0000 1.1.1.1 --- telnet.monitor 17 Apr 2005 07:42:27 -0000 1.2 *************** *** 9,13 **** # Arguments are "host [host...]" # ! # Jim Trocki, tr...@tr... # # $Id$ --- 9,13 ---- # Arguments are "host [host...]" # ! # Jim Trocki, tr...@ar... # # $Id$ Index: pop3.monitor =================================================================== RCS file: /cvsroot/mon/mon/mon.d/pop3.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** pop3.monitor 9 Jun 2004 05:18:04 -0000 1.1.1.1 --- pop3.monitor 17 Apr 2005 07:42:27 -0000 1.2 *************** *** 9,13 **** # # Adapted from "http.monitor" by ! # Jim Trocki, tr...@tr... # # http.monitor written by --- 9,13 ---- # # Adapted from "http.monitor" by ! # Jim Trocki, tr...@ar... # # http.monitor written by Index: nntp.monitor =================================================================== RCS file: /cvsroot/mon/mon/mon.d/nntp.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** nntp.monitor 9 Jun 2004 05:18:04 -0000 1.1.1.1 --- nntp.monitor 17 Apr 2005 07:42:27 -0000 1.2 *************** *** 19,23 **** # # Adapted from "http.monitor" by ! # Jim Trocki, tr...@tr... # authentication support added by # Kai Schaetzl/conactive.com --- 19,23 ---- # # Adapted from "http.monitor" by ! # Jim Trocki, tr...@ar... # authentication support added by # Kai Schaetzl/conactive.com Index: imap.monitor =================================================================== RCS file: /cvsroot/mon/mon/mon.d/imap.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** imap.monitor 9 Jun 2004 05:18:05 -0000 1.1.1.1 --- imap.monitor 17 Apr 2005 07:42:27 -0000 1.2 *************** *** 9,13 **** # # Adapted from "http.monitor" by ! # Jim Trocki, tr...@tr... # # http.monitor written by --- 9,13 ---- # # Adapted from "http.monitor" by ! # Jim Trocki, tr...@ar... # # http.monitor written by Index: seq.monitor =================================================================== RCS file: /cvsroot/mon/mon/mon.d/seq.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** seq.monitor 9 Jun 2004 05:18:04 -0000 1.1.1.1 --- seq.monitor 17 Apr 2005 07:42:27 -0000 1.2 *************** *** 18,22 **** # time you run this. # ! # Jim Trocki, tr...@tr... # # $Id$ --- 18,22 ---- # time you run this. # ! # Jim Trocki, tr...@ar... # # $Id$ Index: fping.monitor =================================================================== RCS file: /cvsroot/mon/mon/mon.d/fping.monitor,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fping.monitor 15 Nov 2004 14:45:19 -0000 1.2 --- fping.monitor 17 Apr 2005 07:42:27 -0000 1.3 *************** *** 3,7 **** # Return a list of hosts which not reachable via ICMP echo # ! # Jim Trocki, tr...@tr... # # $Id$ --- 3,7 ---- # Return a list of hosts which not reachable via ICMP echo # ! # Jim Trocki, tr...@ar... # # $Id$ Index: tcp.monitor =================================================================== RCS file: /cvsroot/mon/mon/mon.d/tcp.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** tcp.monitor 9 Jun 2004 05:18:04 -0000 1.1.1.1 --- tcp.monitor 17 Apr 2005 07:42:27 -0000 1.2 *************** *** 6,10 **** # Arguments are "-p port host [host...]" # ! # Jim Trocki, tr...@tr... # # $Id$ --- 6,10 ---- # Arguments are "-p port host [host...]" # ! # Jim Trocki, tr...@ar... # # $Id$ Index: freespace.monitor =================================================================== RCS file: /cvsroot/mon/mon/mon.d/freespace.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** freespace.monitor 9 Jun 2004 05:18:05 -0000 1.1.1.1 --- freespace.monitor 17 Apr 2005 07:42:27 -0000 1.2 *************** *** 24,28 **** # your friendly neighborhood CPAN mirror. See http://www.perl.com/perl/ # ! # Jim Trocki, tr...@tr... # # $Id$ --- 24,28 ---- # your friendly neighborhood CPAN mirror. See http://www.perl.com/perl/ # ! # Jim Trocki, tr...@ar... # # $Id$ |
|
From: Jim T. <tr...@us...> - 2005-04-17 07:42:36
|
Update of /cvsroot/mon/mon/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4889/utils Modified Files: cf-to-hosts Log Message: updated email addr Index: cf-to-hosts =================================================================== RCS file: /cvsroot/mon/mon/utils/cf-to-hosts,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** cf-to-hosts 9 Jun 2004 05:18:04 -0000 1.1.1.1 --- cf-to-hosts 17 Apr 2005 07:42:27 -0000 1.2 *************** *** 4,8 **** # into a local hosts file # ! # Jim Trocki, tr...@tr... # # $Id$ --- 4,8 ---- # into a local hosts file # ! # Jim Trocki, tr...@ar... # # $Id$ |
|
From: Jim T. <tr...@us...> - 2005-04-17 07:42:36
|
Update of /cvsroot/mon/mon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4889 Modified Files: README mon mon.spec Removed Files: mon.lsm Log Message: updated email addr Index: README =================================================================== RCS file: /cvsroot/mon/mon/README,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** README 15 Nov 2004 14:45:16 -0000 1.2 --- README 17 Apr 2005 07:42:25 -0000 1.3 *************** *** 86,91 **** ---------- Jim Trocki ! Computer System and Network Engineer ! Transmeta Corporation ! Santa Clara, CA ! tr...@tr... --- 86,88 ---- ---------- Jim Trocki ! tr...@ar... --- mon.lsm DELETED --- Index: mon.spec =================================================================== RCS file: /cvsroot/mon/mon/mon.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mon.spec 15 Nov 2004 14:45:16 -0000 1.2 --- mon.spec 17 Apr 2005 07:42:25 -0000 1.3 *************** *** 46,50 **** Authors: -------- ! Jim Trocki <tr...@tr...> %prep --- 46,50 ---- Authors: -------- ! Jim Trocki <tr...@ar...> %prep Index: mon =================================================================== RCS file: /cvsroot/mon/mon/mon,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** mon 11 Mar 2005 13:10:33 -0000 1.12 --- mon 17 Apr 2005 07:42:25 -0000 1.13 *************** *** 3,7 **** # mon - schedules service tests and triggers alerts upon failures # ! # Jim Trocki, tr...@tr... # # $Id$ --- 3,7 ---- # mon - schedules service tests and triggers alerts upon failures # ! # Jim Trocki, tr...@ar... # # $Id$ *************** *** 27,31 **** my $RCSID='$Id$'; ! my $AUTHOR='tr...@tr...'; my $RELEASE='$Name$'; --- 27,31 ---- my $RCSID='$Id$'; ! my $AUTHOR='tr...@ar...'; my $RELEASE='$Name$'; |
|
From: Jim T. <tr...@us...> - 2005-04-17 07:42:36
|
Update of /cvsroot/mon/mon/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4889/doc Modified Files: README.cgi-bin README.mon.cgi mon.8 moncmd.1 monshow.1 Log Message: updated email addr Index: README.cgi-bin =================================================================== RCS file: /cvsroot/mon/mon/doc/README.cgi-bin,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** README.cgi-bin 15 Nov 2004 14:45:18 -0000 1.2 --- README.cgi-bin 17 Apr 2005 07:42:27 -0000 1.3 *************** *** 27,29 **** Jim Trocki Transmeta Corporation ! tr...@tr... --- 27,29 ---- Jim Trocki Transmeta Corporation ! tr...@ar... Index: mon.8 =================================================================== RCS file: /cvsroot/mon/mon/doc/mon.8,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mon.8 15 Nov 2004 14:45:18 -0000 1.3 --- mon.8 17 Apr 2005 07:42:27 -0000 1.4 *************** *** 1602,1604 **** Report bugs to the email address below. .SH AUTHOR ! Jim Trocki <tr...@tr...> --- 1602,1604 ---- Report bugs to the email address below. .SH AUTHOR ! Jim Trocki <tr...@ar...> Index: monshow.1 =================================================================== RCS file: /cvsroot/mon/mon/doc/monshow.1,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** monshow.1 9 Jun 2004 05:18:06 -0000 1.1.1.1 --- monshow.1 17 Apr 2005 07:42:27 -0000 1.2 *************** *** 304,306 **** Report bugs to the email address below. .SH AUTHOR ! Jim Trocki <tr...@tr...> --- 304,306 ---- Report bugs to the email address below. .SH AUTHOR ! Jim Trocki <tr...@ar...> Index: moncmd.1 =================================================================== RCS file: /cvsroot/mon/mon/doc/moncmd.1,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** moncmd.1 9 Jun 2004 05:18:06 -0000 1.1.1.1 --- moncmd.1 17 Apr 2005 07:42:27 -0000 1.2 *************** *** 364,366 **** Report bugs to the email address below. .SH AUTHOR ! Jim Trocki <tr...@tr...> --- 364,366 ---- Report bugs to the email address below. .SH AUTHOR ! Jim Trocki <tr...@ar...> Index: README.mon.cgi =================================================================== RCS file: /cvsroot/mon/mon/doc/README.mon.cgi,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** README.mon.cgi 15 Nov 2004 14:45:18 -0000 1.2 --- README.mon.cgi 17 Apr 2005 07:42:27 -0000 1.3 *************** *** 267,271 **** all bugs to him or the mon users mailing list. + Originally by: Arthur K. Chan <ar...@al...> ! + Based on the Mon program by Jim Trocki <tr...@tr...>. http://www.kernel.org/software/mon/ + Rewritten to support Mon::Client, mod_perl, taint mode, --- 267,271 ---- all bugs to him or the mon users mailing list. + Originally by: Arthur K. Chan <ar...@al...> ! + Based on the Mon program by Jim Trocki <tr...@ar...>. http://www.kernel.org/software/mon/ + Rewritten to support Mon::Client, mod_perl, taint mode, |
|
From: Jim T. <tr...@us...> - 2005-04-17 07:42:36
|
Update of /cvsroot/mon/mon/muxpect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4889/muxpect Modified Files: README Log Message: updated email addr Index: README =================================================================== RCS file: /cvsroot/mon/mon/muxpect/README,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** README 9 Jun 2004 05:18:04 -0000 1.1.1.1 --- README 17 Apr 2005 07:42:27 -0000 1.2 *************** *** 10,12 **** Jim Trocki ! tr...@tr... --- 10,12 ---- Jim Trocki ! tr...@ar... |
|
From: Jim T. <tr...@us...> - 2005-04-17 07:42:35
|
Update of /cvsroot/mon/mon/clients In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4889/clients Modified Files: mon.cgi moncmd monshow Log Message: updated email addr Index: moncmd =================================================================== RCS file: /cvsroot/mon/mon/clients/moncmd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** moncmd 15 Nov 2004 14:45:17 -0000 1.2 --- moncmd 17 Apr 2005 07:42:26 -0000 1.3 *************** *** 3,7 **** # moncmd - send a command to the mon server # ! # Jim Trocki, tr...@tr... # # $Id$ --- 3,7 ---- # moncmd - send a command to the mon server # ! # Jim Trocki, tr...@ar... # # $Id$ Index: mon.cgi =================================================================== RCS file: /cvsroot/mon/mon/clients/mon.cgi,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mon.cgi 15 Nov 2004 14:45:17 -0000 1.2 --- mon.cgi 17 Apr 2005 07:42:26 -0000 1.3 *************** *** 19,23 **** # Originally by: # Arthur K. Chan <ar...@al...> ! # Based on the Mon program by Jim Trocki <tr...@tr...>. # http://www.kernel.org/software/mon/ # Rewritten to support Mon::Client, mod_perl, taint mode, --- 19,23 ---- # Originally by: # Arthur K. Chan <ar...@al...> ! # Based on the Mon program by Jim Trocki <tr...@ar...>. # http://www.kernel.org/software/mon/ # Rewritten to support Mon::Client, mod_perl, taint mode, Index: monshow =================================================================== RCS file: /cvsroot/mon/mon/clients/monshow,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** monshow 15 Nov 2004 14:45:17 -0000 1.2 --- monshow 17 Apr 2005 07:42:26 -0000 1.3 *************** *** 3,7 **** # monshow - concise, user view-based opstatus summary # ! # Jim Trocki, tr...@tr... # # $Id$ --- 3,7 ---- # monshow - concise, user view-based opstatus summary # ! # Jim Trocki, tr...@ar... # # $Id$ |
|
From: Jim T. <tr...@us...> - 2005-04-17 07:42:35
|
Update of /cvsroot/mon/mon/clients/skymon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4889/clients/skymon Modified Files: README skymon Log Message: updated email addr Index: README =================================================================== RCS file: /cvsroot/mon/mon/clients/skymon/README,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** README 9 Jun 2004 05:18:07 -0000 1.1.1.1 --- README 17 Apr 2005 07:42:26 -0000 1.2 *************** *** 66,70 **** --------------------- Jim Trocki ! Transmeta Corporation ! Santa Clara, CA ! tr...@tr... --- 66,68 ---- --------------------- Jim Trocki ! tr...@ar... Index: skymon =================================================================== RCS file: /cvsroot/mon/mon/clients/skymon/skymon,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** skymon 9 Jun 2004 05:18:07 -0000 1.1.1.1 --- skymon 17 Apr 2005 07:42:26 -0000 1.2 *************** *** 7,11 **** # skytel pager email address should be supplied as first argument # ! # Jim Trocki, tr...@tr... # # $Id$ --- 7,11 ---- # skytel pager email address should be supplied as first argument # ! # Jim Trocki, tr...@ar... # # $Id$ |
|
From: Jim T. <tr...@us...> - 2005-04-17 07:42:34
|
Update of /cvsroot/mon/mon/alert.d In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4889/alert.d Modified Files: alert.template file.alert irc.alert mail.alert netpage.alert qpage.alert trap.alert Log Message: updated email addr Index: alert.template =================================================================== RCS file: /cvsroot/mon/mon/alert.d/alert.template,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** alert.template 9 Jun 2004 05:18:07 -0000 1.1.1.1 --- alert.template 17 Apr 2005 07:42:26 -0000 1.2 *************** *** 3,7 **** # template for an alert # ! # Jim Trocki, tr...@tr... # # $Id$ --- 3,7 ---- # template for an alert # ! # Jim Trocki, tr...@ar... # # $Id$ Index: trap.alert =================================================================== RCS file: /cvsroot/mon/mon/alert.d/trap.alert,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** trap.alert 14 Jun 2004 10:53:54 -0000 1.2 --- trap.alert 17 Apr 2005 07:42:26 -0000 1.3 *************** *** 5,9 **** # Specify user and pass via MON_TRAP_USER (-U) and MON_TRAP_PASS (-P) # ! # Jim Trocki, tr...@tr... # # $Id$ --- 5,9 ---- # Specify user and pass via MON_TRAP_USER (-U) and MON_TRAP_PASS (-P) # ! # Jim Trocki, tr...@ar... # # $Id$ Index: netpage.alert =================================================================== RCS file: /cvsroot/mon/mon/alert.d/netpage.alert,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** netpage.alert 9 Jun 2004 05:18:07 -0000 1.1.1.1 --- netpage.alert 17 Apr 2005 07:42:26 -0000 1.2 *************** *** 8,12 **** # file, it is clear that the paging alert is network-dependent. # ! # Jim Trocki, tr...@tr... # # $Id$ --- 8,12 ---- # file, it is clear that the paging alert is network-dependent. # ! # Jim Trocki, tr...@ar... # # $Id$ Index: file.alert =================================================================== RCS file: /cvsroot/mon/mon/alert.d/file.alert,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** file.alert 9 Jun 2004 05:18:07 -0000 1.1.1.1 --- file.alert 17 Apr 2005 07:42:26 -0000 1.2 *************** *** 6,10 **** # to a pager or email subject line. # ! # Jim Trocki, tr...@tr... # # $Id$ --- 6,10 ---- # to a pager or email subject line. # ! # Jim Trocki, tr...@ar... # # $Id$ Index: irc.alert =================================================================== RCS file: /cvsroot/mon/mon/alert.d/irc.alert,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** irc.alert 9 Jun 2004 05:18:07 -0000 1.1.1.1 --- irc.alert 17 Apr 2005 07:42:26 -0000 1.2 *************** *** 24,28 **** # sending each line. secs may be fractional. # ! # Jim Trocki, tr...@tr... # # $Id$ --- 24,28 ---- # sending each line. secs may be fractional. # ! # Jim Trocki, tr...@ar... # # $Id$ Index: qpage.alert =================================================================== RCS file: /cvsroot/mon/mon/alert.d/qpage.alert,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** qpage.alert 9 Jun 2004 05:18:07 -0000 1.1.1.1 --- qpage.alert 17 Apr 2005 07:42:26 -0000 1.2 *************** *** 12,16 **** # -q SNPP server, translates to "qpage -s" # ! # Jim Trocki, tr...@tr... # # Copyright (C) 1998, Jim Trocki --- 12,16 ---- # -q SNPP server, translates to "qpage -s" # ! # Jim Trocki, tr...@ar... # # Copyright (C) 1998, Jim Trocki Index: mail.alert =================================================================== RCS file: /cvsroot/mon/mon/alert.d/mail.alert,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mail.alert 6 Oct 2004 16:29:19 -0000 1.2 --- mail.alert 17 Apr 2005 07:42:26 -0000 1.3 *************** *** 8,12 **** # -f from@addr.x set the smtp envelope "from" address # ! # Jim Trocki, tr...@tr... # # $Id$ --- 8,12 ---- # -f from@addr.x set the smtp envelope "from" address # ! # Jim Trocki, tr...@ar... # # $Id$ |
|
From: Jim T. <tr...@us...> - 2005-04-12 21:28:59
|
Update of /cvsroot/mon/mon/clients In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6162/clients Modified Files: Tag: mon-1-0-0pre1 mon.cgi moncmd monshow Log Message: tr...@ar... Index: moncmd =================================================================== RCS file: /cvsroot/mon/mon/clients/moncmd,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -C2 -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 *** moncmd 24 Jun 2004 18:46:48 -0000 1.1.1.1.2.1 --- moncmd 12 Apr 2005 21:27:58 -0000 1.1.1.1.2.2 *************** *** 3,7 **** # moncmd - send a command to the mon server # ! # Jim Trocki, tr...@tr... # # $Id$ --- 3,7 ---- # moncmd - send a command to the mon server # ! # Jim Trocki, tr...@ar... # # $Id$ Index: monshow =================================================================== RCS file: /cvsroot/mon/mon/clients/monshow,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -C2 -d -r1.1.1.1.2.2 -r1.1.1.1.2.3 *** monshow 14 Dec 2004 22:21:55 -0000 1.1.1.1.2.2 --- monshow 12 Apr 2005 21:27:58 -0000 1.1.1.1.2.3 *************** *** 3,7 **** # monshow - concise, user view-based opstatus summary # ! # Jim Trocki, tr...@tr... # # $Id$ --- 3,7 ---- # monshow - concise, user view-based opstatus summary # ! # Jim Trocki, tr...@ar... # # $Id$ Index: mon.cgi =================================================================== RCS file: /cvsroot/mon/mon/clients/mon.cgi,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** mon.cgi 12 Jul 2004 15:13:57 -0000 1.1.2.2 --- mon.cgi 12 Apr 2005 21:27:58 -0000 1.1.2.3 *************** *** 19,23 **** # Originally by: # Arthur K. Chan <ar...@al...> ! # Based on the Mon program by Jim Trocki <tr...@tr...>. # http://www.kernel.org/software/mon/ # Rewritten to support Mon::Client, mod_perl, taint mode, --- 19,23 ---- # Originally by: # Arthur K. Chan <ar...@al...> ! # Based on the Mon program by Jim Trocki <tr...@ar...>. # http://www.kernel.org/software/mon/ # Rewritten to support Mon::Client, mod_perl, taint mode, |
|
From: Jim T. <tr...@us...> - 2005-04-12 21:28:59
|
Update of /cvsroot/mon/mon/alert.d In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6162/alert.d Modified Files: Tag: mon-1-0-0pre1 alert.template file.alert irc.alert mail.alert netpage.alert qpage.alert trap.alert Log Message: tr...@ar... Index: alert.template =================================================================== RCS file: /cvsroot/mon/mon/alert.d/alert.template,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** alert.template 9 Jun 2004 05:18:07 -0000 1.1.1.1 --- alert.template 12 Apr 2005 21:27:57 -0000 1.1.1.1.2.1 *************** *** 3,7 **** # template for an alert # ! # Jim Trocki, tr...@tr... # # $Id$ --- 3,7 ---- # template for an alert # ! # Jim Trocki, tr...@ar... # # $Id$ Index: trap.alert =================================================================== RCS file: /cvsroot/mon/mon/alert.d/trap.alert,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -C2 -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 *** trap.alert 18 Jun 2004 20:27:49 -0000 1.1.1.1.2.1 --- trap.alert 12 Apr 2005 21:27:57 -0000 1.1.1.1.2.2 *************** *** 5,9 **** # Specify user and pass via MON_TRAP_USER (-U) and MON_TRAP_PASS (-P) # ! # Jim Trocki, tr...@tr... # # $Id$ --- 5,9 ---- # Specify user and pass via MON_TRAP_USER (-U) and MON_TRAP_PASS (-P) # ! # Jim Trocki, tr...@ar... # # $Id$ Index: mail.alert =================================================================== RCS file: /cvsroot/mon/mon/alert.d/mail.alert,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** mail.alert 9 Jun 2004 05:18:07 -0000 1.1.1.1 --- mail.alert 12 Apr 2005 21:27:57 -0000 1.1.1.1.2.1 *************** *** 6,10 **** # to a pager or email subject line. # ! # Jim Trocki, tr...@tr... # # $Id$ --- 6,10 ---- # to a pager or email subject line. # ! # Jim Trocki, tr...@ar... # # $Id$ Index: file.alert =================================================================== RCS file: /cvsroot/mon/mon/alert.d/file.alert,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** file.alert 9 Jun 2004 05:18:07 -0000 1.1.1.1 --- file.alert 12 Apr 2005 21:27:57 -0000 1.1.1.1.2.1 *************** *** 6,10 **** # to a pager or email subject line. # ! # Jim Trocki, tr...@tr... # # $Id$ --- 6,10 ---- # to a pager or email subject line. # ! # Jim Trocki, tr...@ar... # # $Id$ Index: irc.alert =================================================================== RCS file: /cvsroot/mon/mon/alert.d/irc.alert,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** irc.alert 9 Jun 2004 05:18:07 -0000 1.1.1.1 --- irc.alert 12 Apr 2005 21:27:57 -0000 1.1.1.1.2.1 *************** *** 24,28 **** # sending each line. secs may be fractional. # ! # Jim Trocki, tr...@tr... # # $Id$ --- 24,28 ---- # sending each line. secs may be fractional. # ! # Jim Trocki, tr...@ar... # # $Id$ Index: qpage.alert =================================================================== RCS file: /cvsroot/mon/mon/alert.d/qpage.alert,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** qpage.alert 9 Jun 2004 05:18:07 -0000 1.1.1.1 --- qpage.alert 12 Apr 2005 21:27:57 -0000 1.1.1.1.2.1 *************** *** 12,16 **** # -q SNPP server, translates to "qpage -s" # ! # Jim Trocki, tr...@tr... # # Copyright (C) 1998, Jim Trocki --- 12,16 ---- # -q SNPP server, translates to "qpage -s" # ! # Jim Trocki, tr...@ar... # # Copyright (C) 1998, Jim Trocki Index: netpage.alert =================================================================== RCS file: /cvsroot/mon/mon/alert.d/netpage.alert,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** netpage.alert 9 Jun 2004 05:18:07 -0000 1.1.1.1 --- netpage.alert 12 Apr 2005 21:27:57 -0000 1.1.1.1.2.1 *************** *** 8,12 **** # file, it is clear that the paging alert is network-dependent. # ! # Jim Trocki, tr...@tr... # # $Id$ --- 8,12 ---- # file, it is clear that the paging alert is network-dependent. # ! # Jim Trocki, tr...@ar... # # $Id$ |
|
From: Jim T. <tr...@us...> - 2005-04-12 21:28:39
|
Update of /cvsroot/mon/mon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6162 Modified Files: Tag: mon-1-0-0pre1 INSTALL README mon mon.spec Removed Files: Tag: mon-1-0-0pre1 mon.lsm Log Message: tr...@ar... Index: README =================================================================== RCS file: /cvsroot/mon/mon/README,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -C2 -d -r1.1.1.1.2.2 -r1.1.1.1.2.3 *** README 17 Jun 2004 20:28:54 -0000 1.1.1.1.2.2 --- README 12 Apr 2005 21:27:56 -0000 1.1.1.1.2.3 *************** *** 86,91 **** ---------- Jim Trocki ! Computer System and Network Engineer ! Transmeta Corporation ! Santa Clara, CA ! tr...@tr... --- 86,88 ---- ---------- Jim Trocki ! tr...@ar... --- mon.lsm DELETED --- Index: mon.spec =================================================================== RCS file: /cvsroot/mon/mon/mon.spec,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** mon.spec 2 Aug 2004 19:47:31 -0000 1.1.2.2 --- mon.spec 12 Apr 2005 21:27:57 -0000 1.1.2.3 *************** *** 46,50 **** Authors: -------- ! Jim Trocki <tr...@tr...> %prep --- 46,50 ---- Authors: -------- ! Jim Trocki <tr...@ar...> %prep Index: INSTALL =================================================================== RCS file: /cvsroot/mon/mon/INSTALL,v retrieving revision 1.1.1.1.2.6 retrieving revision 1.1.1.1.2.7 diff -C2 -d -r1.1.1.1.2.6 -r1.1.1.1.2.7 *** INSTALL 9 Jan 2005 03:27:55 -0000 1.1.1.1.2.6 --- INSTALL 12 Apr 2005 21:27:56 -0000 1.1.1.1.2.7 *************** *** 86,89 **** --- 86,91 ---- fping.monitor - requires the 'fping' binary, from http://www.fping.com RPM packages available at http://dag.wieers.com/packages/fping/ + The "to-ipv6" version doesn't produce the same output as previous + versions, so use 2.4b2. telnet.monitor - requires the Net::Telnet from CPAN, Index: mon =================================================================== RCS file: /cvsroot/mon/mon/mon,v retrieving revision 1.4.2.17 retrieving revision 1.4.2.18 diff -C2 -d -r1.4.2.17 -r1.4.2.18 *** mon 25 Mar 2005 17:39:30 -0000 1.4.2.17 --- mon 12 Apr 2005 21:27:56 -0000 1.4.2.18 *************** *** 3,7 **** # mon - schedules service tests and triggers alerts upon failures # ! # Jim Trocki, tr...@tr... # # $Id$ --- 3,7 ---- # mon - schedules service tests and triggers alerts upon failures # ! # Jim Trocki, tr...@ar... # # $Id$ *************** *** 27,31 **** my $RCSID='$Id$'; ! my $AUTHOR='tr...@tr...'; my $RELEASE='$Name$'; --- 27,31 ---- my $RCSID='$Id$'; ! my $AUTHOR='tr...@ar...'; my $RELEASE='$Name$'; |
|
From: Jim T. <tr...@us...> - 2005-04-12 21:28:32
|
Update of /cvsroot/mon/mon/mon.d In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6162/mon.d Modified Files: Tag: mon-1-0-0pre1 fping.monitor freespace.monitor imap.monitor nntp.monitor ping.monitor pop3.monitor seq.monitor smtp.monitor tcp.monitor telnet.monitor Log Message: tr...@ar... Index: nntp.monitor =================================================================== RCS file: /cvsroot/mon/mon/mon.d/nntp.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** nntp.monitor 9 Jun 2004 05:18:04 -0000 1.1.1.1 --- nntp.monitor 12 Apr 2005 21:28:00 -0000 1.1.1.1.2.1 *************** *** 19,23 **** # # Adapted from "http.monitor" by ! # Jim Trocki, tr...@tr... # authentication support added by # Kai Schaetzl/conactive.com --- 19,23 ---- # # Adapted from "http.monitor" by ! # Jim Trocki, tr...@ar... # authentication support added by # Kai Schaetzl/conactive.com Index: telnet.monitor =================================================================== RCS file: /cvsroot/mon/mon/mon.d/telnet.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** telnet.monitor 9 Jun 2004 05:18:04 -0000 1.1.1.1 --- telnet.monitor 12 Apr 2005 21:28:00 -0000 1.1.1.1.2.1 *************** *** 9,13 **** # Arguments are "host [host...]" # ! # Jim Trocki, tr...@tr... # # $Id$ --- 9,13 ---- # Arguments are "host [host...]" # ! # Jim Trocki, tr...@ar... # # $Id$ Index: pop3.monitor =================================================================== RCS file: /cvsroot/mon/mon/mon.d/pop3.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** pop3.monitor 9 Jun 2004 05:18:04 -0000 1.1.1.1 --- pop3.monitor 12 Apr 2005 21:28:00 -0000 1.1.1.1.2.1 *************** *** 9,13 **** # # Adapted from "http.monitor" by ! # Jim Trocki, tr...@tr... # # http.monitor written by --- 9,13 ---- # # Adapted from "http.monitor" by ! # Jim Trocki, tr...@ar... # # http.monitor written by Index: freespace.monitor =================================================================== RCS file: /cvsroot/mon/mon/mon.d/freespace.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** freespace.monitor 9 Jun 2004 05:18:05 -0000 1.1.1.1 --- freespace.monitor 12 Apr 2005 21:28:00 -0000 1.1.1.1.2.1 *************** *** 24,28 **** # your friendly neighborhood CPAN mirror. See http://www.perl.com/perl/ # ! # Jim Trocki, tr...@tr... # # $Id$ --- 24,28 ---- # your friendly neighborhood CPAN mirror. See http://www.perl.com/perl/ # ! # Jim Trocki, tr...@ar... # # $Id$ Index: seq.monitor =================================================================== RCS file: /cvsroot/mon/mon/mon.d/seq.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** seq.monitor 9 Jun 2004 05:18:04 -0000 1.1.1.1 --- seq.monitor 12 Apr 2005 21:28:00 -0000 1.1.1.1.2.1 *************** *** 18,22 **** # time you run this. # ! # Jim Trocki, tr...@tr... # # $Id$ --- 18,22 ---- # time you run this. # ! # Jim Trocki, tr...@ar... # # $Id$ Index: smtp.monitor =================================================================== RCS file: /cvsroot/mon/mon/mon.d/smtp.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** smtp.monitor 9 Jun 2004 05:18:04 -0000 1.1.1.1 --- smtp.monitor 12 Apr 2005 21:28:00 -0000 1.1.1.1.2.1 *************** *** 9,13 **** # # Adapted from "http.monitor" by ! # Jim Trocki, tr...@tr... # # http.monitor written by --- 9,13 ---- # # Adapted from "http.monitor" by ! # Jim Trocki, tr...@ar... # # http.monitor written by *************** *** 209,212 **** --- 209,218 ---- $result->{"detail"} .= $in; + while ($in =~ /^221-/) + { + $in = <S>; + $result->{"detail"} .= $in; + } + if ($in !~ /^221 /) { Index: imap.monitor =================================================================== RCS file: /cvsroot/mon/mon/mon.d/imap.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** imap.monitor 9 Jun 2004 05:18:05 -0000 1.1.1.1 --- imap.monitor 12 Apr 2005 21:28:00 -0000 1.1.1.1.2.1 *************** *** 9,13 **** # # Adapted from "http.monitor" by ! # Jim Trocki, tr...@tr... # # http.monitor written by --- 9,13 ---- # # Adapted from "http.monitor" by ! # Jim Trocki, tr...@ar... # # http.monitor written by Index: tcp.monitor =================================================================== RCS file: /cvsroot/mon/mon/mon.d/tcp.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** tcp.monitor 9 Jun 2004 05:18:04 -0000 1.1.1.1 --- tcp.monitor 12 Apr 2005 21:28:00 -0000 1.1.1.1.2.1 *************** *** 6,10 **** # Arguments are "-p port host [host...]" # ! # Jim Trocki, tr...@tr... # # $Id$ --- 6,10 ---- # Arguments are "-p port host [host...]" # ! # Jim Trocki, tr...@ar... # # $Id$ Index: fping.monitor =================================================================== RCS file: /cvsroot/mon/mon/mon.d/fping.monitor,v retrieving revision 1.1.1.1.2.3 retrieving revision 1.1.1.1.2.4 diff -C2 -d -r1.1.1.1.2.3 -r1.1.1.1.2.4 *** fping.monitor 9 Jan 2005 03:27:56 -0000 1.1.1.1.2.3 --- fping.monitor 12 Apr 2005 21:28:00 -0000 1.1.1.1.2.4 *************** *** 3,7 **** # Return a list of hosts which not reachable via ICMP echo # ! # Jim Trocki, tr...@tr... # # $Id$ --- 3,7 ---- # Return a list of hosts which not reachable via ICMP echo # ! # Jim Trocki, tr...@ar... # # $Id$ Index: ping.monitor =================================================================== RCS file: /cvsroot/mon/mon/mon.d/ping.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** ping.monitor 9 Jun 2004 05:18:04 -0000 1.1.1.1 --- ping.monitor 12 Apr 2005 21:28:00 -0000 1.1.1.1.2.1 *************** *** 3,7 **** # Return a list of hosts which not reachable via ICMP echo # ! # Jim Trocki, tr...@tr... # # $Id$ --- 3,7 ---- # Return a list of hosts which not reachable via ICMP echo # ! # Jim Trocki, tr...@ar... # # $Id$ |
|
From: Jim T. <tr...@us...> - 2005-04-12 21:28:32
|
Update of /cvsroot/mon/mon/muxpect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6162/muxpect Modified Files: Tag: mon-1-0-0pre1 README Log Message: tr...@ar... Index: README =================================================================== RCS file: /cvsroot/mon/mon/muxpect/README,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** README 9 Jun 2004 05:18:04 -0000 1.1.1.1 --- README 12 Apr 2005 21:28:00 -0000 1.1.1.1.2.1 *************** *** 10,12 **** Jim Trocki ! tr...@tr... --- 10,12 ---- Jim Trocki ! tr...@ar... |
|
From: Jim T. <tr...@us...> - 2005-04-12 21:28:32
|
Update of /cvsroot/mon/mon/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6162/utils Modified Files: Tag: mon-1-0-0pre1 cf-to-hosts Log Message: tr...@ar... Index: cf-to-hosts =================================================================== RCS file: /cvsroot/mon/mon/utils/cf-to-hosts,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** cf-to-hosts 9 Jun 2004 05:18:04 -0000 1.1.1.1 --- cf-to-hosts 12 Apr 2005 21:28:00 -0000 1.1.1.1.2.1 *************** *** 4,8 **** # into a local hosts file # ! # Jim Trocki, tr...@tr... # # $Id$ --- 4,8 ---- # into a local hosts file # ! # Jim Trocki, tr...@ar... # # $Id$ |
|
From: Jim T. <tr...@us...> - 2005-04-12 21:28:32
|
Update of /cvsroot/mon/mon/etc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6162/etc Modified Files: Tag: mon-1-0-0pre1 example.m4 Log Message: tr...@ar... Index: example.m4 =================================================================== RCS file: /cvsroot/mon/mon/etc/example.m4,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** example.m4 9 Jun 2004 05:18:06 -0000 1.1.1.1 --- example.m4 12 Apr 2005 21:27:59 -0000 1.1.1.1.2.1 *************** *** 20,24 **** define(_ANYTIME_, `wd {Sun-Sat}')dnl define(_OFF_HOURS_, `wd {Mon-Fri} hr {10pm-7am}, wd {Sat Sun}')dnl ! define(_WORK_HOURS_, `wd {Mon-Fri} hr {7am-10pm}')dnl define(_PAGING_HOURS_, `_WORK_HOURS_')dnl dnl --- 20,24 ---- define(_ANYTIME_, `wd {Sun-Sat}')dnl define(_OFF_HOURS_, `wd {Mon-Fri} hr {10pm-7am}, wd {Sat Sun}')dnl ! define(_WORK_HOURS_, `wd {Mon-Fri} hr {8am-9pm}')dnl define(_PAGING_HOURS_, `_WORK_HOURS_')dnl dnl |
|
From: Jim T. <tr...@us...> - 2005-04-12 21:28:32
|
Update of /cvsroot/mon/mon/clients/skymon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6162/clients/skymon Modified Files: Tag: mon-1-0-0pre1 README skymon Log Message: tr...@ar... Index: README =================================================================== RCS file: /cvsroot/mon/mon/clients/skymon/README,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** README 9 Jun 2004 05:18:07 -0000 1.1.1.1 --- README 12 Apr 2005 21:27:58 -0000 1.1.1.1.2.1 *************** *** 66,70 **** --------------------- Jim Trocki ! Transmeta Corporation ! Santa Clara, CA ! tr...@tr... --- 66,68 ---- --------------------- Jim Trocki ! tr...@ar... Index: skymon =================================================================== RCS file: /cvsroot/mon/mon/clients/skymon/skymon,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** skymon 9 Jun 2004 05:18:07 -0000 1.1.1.1 --- skymon 12 Apr 2005 21:27:59 -0000 1.1.1.1.2.1 *************** *** 7,11 **** # skytel pager email address should be supplied as first argument # ! # Jim Trocki, tr...@tr... # # $Id$ --- 7,11 ---- # skytel pager email address should be supplied as first argument # ! # Jim Trocki, tr...@ar... # # $Id$ |
|
From: Jim T. <tr...@us...> - 2005-04-12 21:28:32
|
Update of /cvsroot/mon/mon/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6162/doc Modified Files: Tag: mon-1-0-0pre1 README.cgi-bin README.mon.cgi mon.8 moncmd.1 monshow.1 Log Message: tr...@ar... Index: README.cgi-bin =================================================================== RCS file: /cvsroot/mon/mon/doc/README.cgi-bin,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -C2 -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 *** README.cgi-bin 12 Jul 2004 13:17:40 -0000 1.1.1.1.2.1 --- README.cgi-bin 12 Apr 2005 21:27:59 -0000 1.1.1.1.2.2 *************** *** 26,29 **** Jim Trocki ! Transmeta Corporation ! tr...@tr... --- 26,28 ---- Jim Trocki ! tr...@ar... Index: mon.8 =================================================================== RCS file: /cvsroot/mon/mon/doc/mon.8,v retrieving revision 1.1.1.1.2.6 retrieving revision 1.1.1.1.2.7 diff -C2 -d -r1.1.1.1.2.6 -r1.1.1.1.2.7 *** mon.8 22 Nov 2004 18:47:54 -0000 1.1.1.1.2.6 --- mon.8 12 Apr 2005 21:27:59 -0000 1.1.1.1.2.7 *************** *** 1516,1518 **** Report bugs to the email address below. .SH AUTHOR ! Jim Trocki <tr...@tr...> --- 1516,1518 ---- Report bugs to the email address below. .SH AUTHOR ! Jim Trocki <tr...@ar...> Index: monshow.1 =================================================================== RCS file: /cvsroot/mon/mon/doc/monshow.1,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -C2 -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 *** monshow.1 14 Dec 2004 22:17:57 -0000 1.1.1.1.2.1 --- monshow.1 12 Apr 2005 21:27:59 -0000 1.1.1.1.2.2 *************** *** 308,310 **** Report bugs to the email address below. .SH AUTHOR ! Jim Trocki <tr...@tr...> --- 308,310 ---- Report bugs to the email address below. .SH AUTHOR ! Jim Trocki <tr...@ar...> Index: moncmd.1 =================================================================== RCS file: /cvsroot/mon/mon/doc/moncmd.1,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** moncmd.1 9 Jun 2004 05:18:06 -0000 1.1.1.1 --- moncmd.1 12 Apr 2005 21:27:59 -0000 1.1.1.1.2.1 *************** *** 364,366 **** Report bugs to the email address below. .SH AUTHOR ! Jim Trocki <tr...@tr...> --- 364,366 ---- Report bugs to the email address below. .SH AUTHOR ! Jim Trocki <tr...@ar...> Index: README.mon.cgi =================================================================== RCS file: /cvsroot/mon/mon/doc/README.mon.cgi,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** README.mon.cgi 12 Jul 2004 01:33:32 -0000 1.1.2.1 --- README.mon.cgi 12 Apr 2005 21:27:59 -0000 1.1.2.2 *************** *** 267,271 **** all bugs to him or the mon users mailing list. + Originally by: Arthur K. Chan <ar...@al...> ! + Based on the Mon program by Jim Trocki <tr...@tr...>. http://www.kernel.org/software/mon/ + Rewritten to support Mon::Client, mod_perl, taint mode, --- 267,271 ---- all bugs to him or the mon users mailing list. + Originally by: Arthur K. Chan <ar...@al...> ! + Based on the Mon program by Jim Trocki <tr...@ar...>. http://www.kernel.org/software/mon/ + Rewritten to support Mon::Client, mod_perl, taint mode, |
|
From: Ed R. <er...@us...> - 2005-04-07 20:18:42
|
Update of /cvsroot/mon/mon-contrib/monitors/bgp/bgp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2691/mon-contrib/monitors/bgp/bgp Modified Files: bgp.monitor bgp.monitor.README Log Message: Better community and error handling Index: bgp.monitor =================================================================== RCS file: /cvsroot/mon/mon-contrib/monitors/bgp/bgp/bgp.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** bgp.monitor 18 Feb 2005 17:52:23 -0000 1.1.1.1 --- bgp.monitor 7 Apr 2005 20:18:29 -0000 1.2 *************** *** 4,8 **** # look at each router and get the status of all is BGP neigbor # ! # Version 1.00 (5 april 2002) # # Copyright 2002, Marc Hauswirth, Safe Host SA <ma...@sa...> --- 4,8 ---- # look at each router and get the status of all is BGP neigbor # ! # Version 1.1 (7 april 2005) # # Copyright 2002, Marc Hauswirth, Safe Host SA <ma...@sa...> *************** *** 22,39 **** # It is also part of MRTG (http://people.ee.ethz.ch/~oetiker/webtools/mrtg/) use SNMP; use SNMP_Session; use strict; ! ## -- ! # The only things that should be changed : ! my $community = "public"; ## -- ! my @summary; ! my @warnings; ! my $details; ! my $summary; # OID's to the SNMP elements that I want to show... --- 22,44 ---- # It is also part of MRTG (http://people.ee.ethz.ch/~oetiker/webtools/mrtg/) + # updated 7 April 2005 by Ed Ravin, <er...@pa...> + # use normal Mon summary / detail reporting + # accept SNMP community via environment var COMMUNITY + # detect SNMP errors + use SNMP; use SNMP_Session; use strict; ! ## -- should be a command-line option, but this is sufficient (and safer, ! ## since the community won't be displayed in the Mon interface to users) ! my $community = $ENV{'COMMUNITY'} || "public"; ## -- ! my @failures; ! my @details; ! ! $ENV{'MIBS'}= ""; # all OIDs needed are specified in script # OID's to the SNMP elements that I want to show... *************** *** 110,113 **** --- 115,123 ---- ); + my %BgpAdminStatus = ( + 1 => "stop", + 2 => "start", + ); + my %state; *************** *** 116,126 **** # Get some infos about this router my $sess = new SNMP::Session ( DestHost => $router, Community => $community ); my $bgpLocalAs = $sess->get("\." . $oids{bgpLocalAs}); my $bgpIdentifier = $sess->get("\." . $oids{bgpIdentifier} . ".0"); ! $details .= "Router: $router (AS $bgpLocalAs) Id : $bgpIdentifier\n"; ! # Get trougnt the SNMP tree to fetch all peer infos ! my $vars = new SNMP::VarList([$oids{bgpPeerIdentifier}],[$oids{bgpPeerRemoteAs}],[$oids{bgpPeerState}],[$oids{bgpPeerFsmEstablishedTime}]); for (my @vals = $sess->getnext($vars); $vars->[0]->tag =~ /15\.3\.1\.1/ # still in table (Did you have a cleaner solutions ?) --- 126,155 ---- # Get some infos about this router my $sess = new SNMP::Session ( DestHost => $router, Community => $community ); + if (!defined($sess)) + { + push @failures, $router; + push @details, "$router: cannot create SNMP session"; + next; + } my $bgpLocalAs = $sess->get("\." . $oids{bgpLocalAs}); + if ($sess->{ErrorNum}) + { + push @failures, $router; + push @details, "$router: error on initial SNMP get: $sess->{ErrorStr}"; + next; + } + my $bgpIdentifier = $sess->get("\." . $oids{bgpIdentifier} . ".0"); + if ($sess->{ErrorNum}) + { + push @failures, $router; + push @details, "$router: error on subsequent SNMP get: $sess->{ErrorStr}"; + next; + } ! push @details, "$router (AS $bgpLocalAs) Id : $bgpIdentifier"; ! # Get through the SNMP tree to fetch all peer infos ! my $vars = new SNMP::VarList([$oids{bgpPeerIdentifier}],[$oids{bgpPeerRemoteAs}],[$oids{bgpPeerState}],[$oids{bgpPeerFsmEstablishedTime}],[$oids{bgpPeerAdminStatus}], [$oids{bgpPeerRemoteAddr}]); for (my @vals = $sess->getnext($vars); $vars->[0]->tag =~ /15\.3\.1\.1/ # still in table (Did you have a cleaner solutions ?) *************** *** 131,157 **** my $textState = $BgpPeerState{$vals[2]}; my $texttime = sectotime($vals[3]); ! $details .= sprintf(" Neighbor %-16s AS %-5u status : %-15s since : %-16s\n",$vals[0], $vals[1], $textState, $texttime); ! if ($vals[2] != 6) { ! $summary .= "Neighbor relation : $router - $vals[0] (AS $vals[1]) is in state $textState"; }; } - $details .= "\n"; } ! if ($summary) { ! print $summary . "\n"; ! print "--------------------------------------------------------------\n"; ! print "Summary : \n"; ! print " " . $summary . "\n"; ! } else { ! print "\n"; }; ! print "--------------------------------------------------------------\n"; ! print "Details \n"; ! print "--------------------------------------------------------------\n"; ! print $details ; ! if ($summary) { # Error state exit exit 1; --- 160,182 ---- my $textState = $BgpPeerState{$vals[2]}; my $texttime = sectotime($vals[3]); ! push @details, sprintf("$router: Neighbor %-16s AS %-5u status : %-15s since : %-16s",$vals[5], $vals[1], $textState, $texttime); ! # if bgpPeerState != established and bgpPeerAdminStatus == start ! if ($vals[2] != 6 and $vals[4] == 2) { ! push @failures, $router; ! push @details, "$router: Neighbor relation: $vals[5] (AS $vals[1]) is in state $textState "; }; } } ! if (@failures) { ! print join(' ', @failures), "\n"; }; ! if (@details) { ! print "\n"; ! print join("\n", @details), "\n"; ! } ! if (@failures) { # Error state exit exit 1; *************** *** 179,181 **** $texttime .= int($sec/60) . "min"; return ($texttime); ! }; \ No newline at end of file --- 204,206 ---- $texttime .= int($sec/60) . "min"; return ($texttime); ! }; Index: bgp.monitor.README =================================================================== RCS file: /cvsroot/mon/mon-contrib/monitors/bgp/bgp/bgp.monitor.README,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** bgp.monitor.README 18 Feb 2005 17:52:23 -0000 1.1.1.1 --- bgp.monitor.README 7 Apr 2005 20:18:30 -0000 1.2 *************** *** 21,34 **** # # EXAMPLES ! # ./bgp.monitor routerIP or name # # OUTPUT ! # I like to have some details, if the result is OK or not. So this ! # script send a list of all peer sessions and is status. # # OPTIONS ! # The SNMP community is hard coded in the script, to avoid that a mon user see ! # this sensible data. ! # you just have to change the variable $community. # # COPYRIGHT --- 21,36 ---- # # EXAMPLES ! # ./bgp.monitor routerIP_or_name [...] # # OUTPUT ! # Displays a list of all peer sessions and status. Exit status will be ! # non-zero if a router cannot be contacted or if a BGP session that should ! # be established isn't. # # OPTIONS ! # To use an SNMP community other than "public", set the COMMUNITY environment ! # variable in mon.cf in the stanza that invokes bgp.monitor. The same ! # community name will be tried for all the routers specified on the command ! # line. # # COPYRIGHT *************** *** 45,47 **** # Fell free to send me your comments to ma...@sa... # ! # Version 1.00 -- 5 april 2002 \ No newline at end of file --- 47,50 ---- # Fell free to send me your comments to ma...@sa... # ! # Version 1.00 -- 5 april 2002 ! # Version 1.1 -- 7 april 2005 |
|
From: Ed R. <er...@us...> - 2005-04-05 21:47:20
|
Update of /cvsroot/mon/mon-contrib/alerts/pager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18724/mon-contrib/alerts/pager Modified Files: pageomat Log Message: Update to current version Index: pageomat =================================================================== RCS file: /cvsroot/mon/mon-contrib/alerts/pager/pageomat,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** pageomat 18 Feb 2005 17:52:13 -0000 1.1.1.1 --- pageomat 5 Apr 2005 21:47:08 -0000 1.2 *************** *** 1,11 **** ! #!/usr/local/bin/perl5 -w ! # send pages to people via paging company Web interfaces or SNPP ! # ! # released to mon list on 7/18/00 ! # alpha version - please send fixes, improvements, or suggestions to ! # Ed Ravin <er...@pa...> use strict; --- 1,21 ---- ! #!/usr/bin/perl -w ! # send pages to people via paging company Web interfaces ! # fall back to qpage if necessary ! # assumes that the service= names in qpage.cf correspond to company= here. ! # assumes that the pagerid= data in qpage.cf corresponds to pin= here. ! # To use fallback, page them with "pageomat --destination=alias" ! # where "alias" is a user entry in qpage.cf ! # To use direct paging, specify "company=" and "pin=". ! ! # Contributed by Ed Ravin <er...@pa...> ! # Code made available courtesy of PANIX Public Access Networks ! # http://www.panix.com ! ! # to do - use qpage syntax throughout ! ! # $Header$ use strict; *************** *** 14,35 **** use Socket; use Net::SNPP; - my $myname="pageomat"; my %opt; ! GetOptions (\%opt, "debug", "pin=s", "company=s", "timeout=i", "message=s"); my %pageinfo= ( 'skytel'=> ! { 'url' => 'snpp://snpp.skytel.com:7777' }, 'skytel-http' => { 'url' => 'http://www.skytel.com/servlet/SendMessage', ! 'format' => 'recipients=%s&message=%s', 'match' => '(Your Message Status Number is: \d+)|(Skytel Messaging Center Has Received Your Message)' } , ! 'bellsouthips' => ! { 'url' => 'http://www.bellsouthips.com/scripts/rampage.dll?ProcessSendMail', ! 'format' => 'pin=%s&media=None&retaddr=&data=%s', ! 'match' => 'Your message has been sent to destination address' }, 'omnipoint' => --- 24,81 ---- use Socket; use Net::SNPP; + use Sys::Syslog qw(:DEFAULT setlogsock); + + ######### CONFIGURABLE STUFF + # + # my $default_from= "no...@ex..."; + my $default_from="root"; + # + ######### + + + + sub syslog_die; + sub syslog_warn; my %opt; ! my $myname="pageomat"; ! my $debug= $opt{'debug'} || undef; ! ! setlogsock('unix') ! if grep /^ $^O $/xo, ("linux", "openbsd", "freebsd", "netbsd"); ! openlog ("$myname", "cons,pid", "daemon") unless $debug; ! ! GetOptions (\%opt, "debug", "destination=s", "pin=s", "company=s", "timeout=i", "message=s", "nofallback", "fallbackmode=s", "directory=s", "from=s"); ! ! my $from= $opt{'from'} || $default_from; my %pageinfo= ( 'skytel'=> ! { 'url' => 'snpp://snpp.skytel.com:444' }, ! ! 'qpage'=> # the local (qpage?) server ! { 'url' => 'snpp://localhost:444' }, ! ! 'qpage-direct'=> ! { 'url' => 'special'}, 'skytel-http' => { 'url' => 'http://www.skytel.com/servlet/SendMessage', ! 'format' => 'clienttimezone=&cmd=post&customMcrs=&recipients=%s&response=' . $from . '&message=%s&countresult=&', 'match' => '(Your Message Status Number is: \d+)|(Skytel Messaging Center Has Received Your Message)' } , ! 'cingular' => ! { 'url' => 'http://www.imcingular.com/processsendmail.asp', ! 'format' => 'pin=%s&data=%s&media=E-mail&retaddr=' . $from, ! 'match' => 'Your message has been sent to destination address', ! }, ! ! 'tmobile'=> ! { 'url' => 'http://www.t-mobile.com/messaging/default.asp', ! 'format' => 'txtNum=%s&txtFrom=' . $from . '&txtMessage=%s&hdnpublic=1&msgTermsUse=on', ! 'match' => 'Your message was sent to ', ! 'referer' => 'Referer: http://www.t-mobile.com/messaging/', ! }, ! 'omnipoint' => *************** *** 39,42 **** --- 85,102 ---- 'referer' => 'Referer: http://www.omnipoint.com/common/center/main.html', 'arg1' => url_encode('http://www.omnipoint.com/common/center/message_sent.html') }, + # "POST /cgi-bin/message.cgi HTTP/1.0\r + # Host: www.omnipoint.com\r + # Accept: text/html, text/plain, text/sgml, */*;q=0.01\r + # Accept-Encoding: gzip, compress\r + # Accept-Language: en\r + # Pragma: no-cache\r + # Cache-Control: no-cache\r + # User-Agent: Lynx/2.8.3rel.1 libwww-FM/2.14\r + # Referer: http://www.omnipoint.com/common/center/main.html\r + # Content-type: application/x-www-form-urlencoded\r + # Content-length: 131\r + # \r + # load=http%3A%2F%2Fwww.omnipoint.com%2Fcommon%2Fcenter%2Fmessage_sent.h\ + # tml&phone=19173798338&message=test+via+omnipoint%27s+web+page" 'bam' => *************** *** 53,215 **** ); ! my $usage="Usage: $myname --pin=pagerid --company={" . join('|', keys %pageinfo) . "}\n"; ! my $debug= $opt{'debug'} || undef; ! my $pin= $opt{'pin'} || die "$usage"; ! my $company= $opt{'company'} || die "$usage"; ! my $timeout= $opt{'timeout'} || 30; ! my $message= $opt{'message'} || join (' ', <STDIN>); - $message =~ s/\n/ /g; ! # chop up url ! my ($protocol, $hostname, $path)= ($pageinfo{$company}{'url'} =~ m!([^:]+)://([^/]+)(.*)!); ! my $port; ! if ($hostname =~ m!([^:]+)(:\d+)!) { ! $hostname= $1; $port= $2; } ! $port=80 unless defined($port); ! $port=~ s/://; ! if ($debug) { ! print "Message to $pin at $company via $pageinfo{$company}{'url'}\n"; ! print "Protocol is $protocol, server is $hostname, port is $port, path is $path\n"; } ! if ($protocol eq "snpp") ! { ! send_snpp($hostname, $port, $pin, $message); ! exit 0; } ! if ($debug) { ! open COMMAND, ">&STDOUT" || die "$0: can't dup fd for debugging: $!"; ! } else { ! my $pro = getprotobyname ('tcp'); ! if (!defined $pro) { ! die "$myname: could not getprotobyname tcp: is there a network here?\n"; ! } ! if (!defined socket (COMMAND, PF_INET, SOCK_STREAM, $pro)) { ! die "$myname: could not create socket: $!\n"; ! } ! my $address = inet_aton ($hostname); ! if (!defined $address) { ! die "$myname: $hostname could not inet_aton"; ! } ! my $sin = sockaddr_in (80, $address); ! if (!defined $sin) { ! die "$0: $hostname/$address could not sockaddr_in"; } ! my $r; ! die "$0: cannot setsockopt: $!" ! unless setsockopt(COMMAND, SOL_SOCKET, SO_LINGER, pack "i i", 1, 10); ! eval { ! local $SIG{"ALRM"} = sub { die "alarm\n" }; ! alarm $timeout; ! $r = connect (COMMAND, $sin); - alarm 0; - }; ! if ($@) { ! if ($@ eq "alarm\n") { ! die "$0: $hostname/$address timeout"; ! } else { ! die "$0: $hostname/$address interrupted syscall: $!"; ! } ! } ! if (!defined $r) { ! die "$0: $hostname/$address could not connect: $!"; ! } ! } ! if ($company eq "skytel-http") ! { ! # Skytel's form chokes on or eats up these characters - so substitute them ! $message =~ s/[&]/{and}/g; ! $message =~ s/[+]/{plus}/g; ! $message =~ s/[%]/{percent}/g; ! } elsif ($company eq "bam") ! { ! # bam doesn't like carrots. Silly rabbit... ! $message =~ s/</(/g; ! $message =~ s/>/)/g; ! } ! $message= url_encode($message); # format for POST'ing ! my $data; ! if (defined($pageinfo{$company}{'arg1'})) ! { ! $data= sprintf $pageinfo{$company}{'format'}, ! $pageinfo{$company}{'arg1'}, $pin, $message; ! } elsif (defined($pageinfo{$company}{'cut_pin_3'})) ! { ! die "PIN must be 10-digit number for this company" ! unless $pin =~ /^\d{10}$/; ! my ($areacode, $exchange, $suffix)= ! (substr($pin,0,3), substr($pin,3,3), substr($pin,6,4)); ! $data= sprintf $pageinfo{$company}{'format'}, ! $areacode, $exchange, $suffix, $message; ! } ! else ! { ! $data= sprintf $pageinfo{$company}{'format'}, $pin, $message; ! } ! select COMMAND; $|=1; select STDOUT; ! print COMMAND "POST $path HTTP/1.0\r\n" . ! "Host: $hostname\r\n" . ! "Accept: text/html, text/plain\r\n" . ! "User-Agent: $myname\r\n" . ! ( defined($pageinfo{$company}{'referer'}) ? ! "$pageinfo{$company}{'referer'}\r\n" : "" ) . ! "Content-type: application/x-www-form-urlencoded\r\n" . ! "Content-length: " . length($data) . "\r\n\r\n" . ! $data; - print COMMAND "\r\n" if $debug; ! $SIG{"PIPE"} = 'IGNORE'; ! shutdown COMMAND, 1; # SHUT_WR - disallow further writes ! my $response= ""; ! my @response; ! alarm $timeout; # just die if we get stuck somehow listening on the socket ! @response= <COMMAND>; $response= join('', @response); ! print length($response), " bytes received.\n"; ! if ( $response =~ $pageinfo{$company}{'match'} ) ! { ! print "Message delivery confirmed to $pin at $hostname:\n"; ! exit 0; ! } else { ! print "No match - cannot confirm message delivery.\n"; ! open TRACE, ">/tmp/pageomat.response.$$" || ! die "$0: cannot create tracefile /tmp/pageomat.$$: $!"; ! print TRACE $response; ! close TRACE; ! exit 1; } --- 113,347 ---- ); ! my $usage="Usage: $myname {--destination=aliasid | --pin=pagerid --company={" . join('|', keys %pageinfo) . "} [-nofallback] [-fallbackmode company] [-directory qpage.cf]}\n"; ! my @company; ! my $pin; ! my $fallbackmode= undef; ! my $destination= $opt{'destination'} || undef; ! my $nofallback= $opt{'nofallback'} || 0; ! my $directory= $opt{'directory'} || "/etc/qpage.cf"; + if (!defined($destination)) + { + $pin= $opt{'pin'} || syslog_die "$usage"; + $company[0]= $opt{'company'} || syslog_die "$usage"; + syslog_die "$myname: fallback only valid with --destination\n" + if defined($opt{'fallbackmode'}) or defined($opt{'nofallback'}); + } else { + load_destination(); + $fallbackmode= $opt{'fallbackmode'}|| "qpage-direct"; + push(@company, $fallbackmode) unless $nofallback; + } + my $timeout= $opt{'timeout'} || 40; + my $message= $opt{'message'} || join (' ', <STDIN>); ! $message =~ s/\n/ /g; ! syslog_warn "$myname: attempting delivery via $company[0]" if $debug; ! deliver_page($company[0]); ! # still here? do a fallback ! ! shift @company; ! if (@company > 0) { ! $pin= $destination; # use the qpage destination ! syslog_warn "$myname: attempting delivery to $destination via $company[0]"; ! deliver_page($company[0]); } ! syslog_warn "$myname: no successful pages sent"; ! exit 3; ! sub syslog_die { ! my $thing = shift; ! ! syslog ("err", $thing); ! die "$myname: $thing\n"; } ! sub syslog_warn { ! my $thing= shift; ! ! syslog("notice", $thing) unless $debug; ! warn "$myname: $thing\n" if $debug; } + sub deliver_page { + my $company= $_[0]; ! syslog_die "$myname: Unknown paging method/company: $company" ! unless exists($pageinfo{$company}); ! ! if ($company eq "qpage-direct") ! { ! open(QPAGE, "|qpage -p $destination -f $from") || ! syslog_die "$myname: cannot open qpage: $!"; ! print QPAGE "$message\n"; ! print QPAGE ".\n"; ! close QPAGE || syslog_die "$myname: qpage exit error: $?"; ! syslog_warn "$myname: page sent to $destination via qpage direct"; ! exit 0; } ! # chop up url ! my ($protocol, $hostname, $path)= ($pageinfo{$company}{'url'} =~ m!([^:]+)://([^/]+)(.*)!); ! my $port; ! if ($hostname =~ m!([^:]+)(:\d+)!) ! { ! $hostname= $1; $port= $2; ! } ! $port=80 unless defined($port); ! $port=~ s/://; ! if ($debug) { ! print "Message to $pin at $company via $pageinfo{$company}{'url'}\n"; ! print "Protocol is $protocol, server is $hostname, port is $port, path is $path\n"; ! } ! if ($protocol eq "snpp") ! { ! my $rc= ! send_snpp($hostname, $port, $pin, ! $message . "\nFrom $from via SNPP to $hostname"); ! syslog_warn("page to $pin at $company via $pageinfo{$company}{'url'} " . ($rc ? "success" : "FAILED") ); ! exit 0 if $rc; ! return 0; ! } ! if ($debug) { ! open COMMAND, ">&STDOUT" || die "$myname: can't dup fd for debugging: $!"; ! } else { ! my $pro = getprotobyname ('tcp'); ! if (!defined $pro) { ! syslog_die "$myname: could not getprotobyname tcp: is there a network here?\n"; ! } ! if (!defined socket (COMMAND, PF_INET, SOCK_STREAM, $pro)) { ! syslog_die "$myname: could not create socket: $!\n"; ! } ! my $address = inet_aton ($hostname); ! if (!defined $address) { ! syslog_die "$myname: $hostname could not inet_aton"; ! } ! my $sin = sockaddr_in (80, $address); ! if (!defined $sin) { ! syslog_die "$myname: $hostname/$address could not sockaddr_in"; ! } ! my $r; ! syslog_die "$myname: cannot setsockopt: $!" ! unless setsockopt(COMMAND, SOL_SOCKET, SO_LINGER, pack "i i", 1, 10); + eval { + local $SIG{"ALRM"} = sub { die "alarm\n" }; ! alarm $timeout; ! $r = connect (COMMAND, $sin); ! alarm 0; ! }; ! if ($@) { ! if ($@ eq "alarm\n") { ! syslog_die "$myname: $hostname/$address timeout"; ! } else { ! syslog_die "$myname: $hostname/$address interrupted syscall: $!"; ! } ! } ! if (!defined $r) { ! syslog_die "$myname: $hostname/$address could not connect: $!"; ! } ! } ! if ($company eq "skytel-http") ! { ! # Skytel's form chokes on or eats up these characters - so substitute them ! $message =~ s/[&]/{and}/g; ! $message =~ s/[+]/{plus}/g; ! $message =~ s/[%]/{percent}/g; ! } elsif ($company eq "bam") ! { ! # bam doesn't like carrots. Silly rabbit... ! $message =~ s/</(/g; ! $message =~ s/>/)/g; ! } + $message= url_encode($message); # format for POST'ing ! my $data; ! if (defined($pageinfo{$company}{'arg1'})) ! { ! $data= sprintf $pageinfo{$company}{'format'}, ! $pageinfo{$company}{'arg1'}, $pin, $message; ! } elsif (defined($pageinfo{$company}{'cut_pin_3'})) ! { ! syslog_die "PIN must be 10-digit number for this company" ! unless $pin =~ /^\d{10}$/; ! my ($areacode, $exchange, $suffix)= ! (substr($pin,0,3), substr($pin,3,3), substr($pin,6,4)); ! $data= sprintf $pageinfo{$company}{'format'}, ! $areacode, $exchange, $suffix, $message; ! } ! else ! { ! $data= sprintf $pageinfo{$company}{'format'}, $pin, $message; ! } ! select COMMAND; $|=1; select STDOUT; ! print COMMAND "POST $path HTTP/1.0\r\n" . ! "Host: $hostname\r\n" . ! "Accept: text/html, text/plain\r\n" . ! "User-Agent: $myname\r\n" . ! ( defined($pageinfo{$company}{'referer'}) ? ! "$pageinfo{$company}{'referer'}\r\n" : "" ) . ! "Content-type: application/x-www-form-urlencoded\r\n" . ! "Content-length: " . length($data) . "\r\n\r\n" . ! $data; ! print COMMAND "\r\n" if $debug; ! ! $SIG{"PIPE"} = 'IGNORE'; ! shutdown COMMAND, 1 unless $debug; # SHUT_WR - disallow further writes ! ! ! my $response= ""; ! my @response; ! ! alarm $timeout; # just die if we get stuck somehow listening on the socket ! ! @response= <COMMAND>; $response= join('', @response); ! ! print length($response), " bytes received.\n"; ! ! if ( $response =~ $pageinfo{$company}{'match'} ) ! { ! print "Message delivery confirmed to $pin at $hostname:\n"; ! syslog_warn("page to $pin at $company via $pageinfo{$company}{'url'} success"); ! exit 0; ! } else { ! print "No match - cannot confirm message delivery.\n"; ! my $rc= open(TRACE, ">/tmp/pageomat.response.$company.$$"); ! if ($rc) ! { ! print TRACE $response; ! close TRACE; ! } else { ! syslog_warn "$myname: cannot create tracefile /tmp/pageomat.$company.$$: $!"; ! } ! syslog_warn("page to $pin at $company via $pageinfo{$company}{'url'} FAILED, " . ($rc ? "see tracefile" : "tracefile failed too") ); ! return 1; ! } } *************** *** 219,230 **** my ($host, $port, $pagerid, $text) = @_; my $rc; ! my $snpp = Net::SNPP->new ($host, Port => $port, Timeout => 60) ! or die "SNPP->new fails: $!"; $rc= $snpp->send ( Pager => [ $pagerid ], Message => "$text" ); ! die "SNPP send fails." unless $rc; ! $snpp->quit; } --- 351,372 ---- my ($host, $port, $pagerid, $text) = @_; my $rc; ! my $snpp; ! ! if (! ($snpp= Net::SNPP->new ($host, Port => $port, Timeout => $timeout)) ) ! { ! syslog_warn "$myname: SNPP->new fails: $!"; ! return 0; ! } $rc= $snpp->send ( Pager => [ $pagerid ], Message => "$text" ); ! if ($rc == 0) ! { ! syslog_warn "$myname: SNPP send failed: [sorry, no diagnostics]" unless $rc; ! return 0; ! } $snpp->quit; + syslog_warn "$myname: successful SNPP delivery to $host" if $debug; + return 1; } *************** *** 241,242 **** --- 383,446 ---- } + sub load_destination { + # + # open paging directory - qpage.cf format + # look up $destination + # if found, set $pin, @company + + my %qpagedir= (); + my ($pager, $pagerid, $service)= ("", "", ""); + my $state= 'nothingseen'; # or 'pagerseen' + + # parse qpage.cf entries: + # + # pager=thisuser + # pagerid=1234567890 + # service=skytel + + open QPAGECF, "<" . $directory || syslog_die "$myname: cannot open $directory: $!\n"; + + while (<QPAGECF>) + { + chomp; + + if ($state eq 'nothingseen') + { + if ( /^\s*pager\s*=\s*(\w+)/ ) + { + $state= 'pagerseen'; + $pager= $1; + } + } elsif ($state eq 'pagerseen') + { + if ( /^\s*(pagerid|service)\s*=\s*([^ #]+).*$/ ) + { + $pagerid= $2 if $1 eq "pagerid"; + $service= $2 if $1 eq "service"; + if ($pagerid ne "" and $service ne "") + { + $qpagedir{$pager}= [ $pagerid, $service ]; + $state= 'nothingseen'; + $pagerid=""; + $service=""; + } + } elsif ( /^\s*pager\s*=\s*(\w+)/ ) + { + syslog_warn "$myname: discarding entry $pager - incomplete"; + $pager= $1; + } + + }; + }; + + syslog_die "$myname: could not find destination $destination in $directory.\n" + if !exists($qpagedir{$destination}); + + $pin= $qpagedir{$destination}[0]; + push(@company, $qpagedir{$destination}[1]); + + # foreach my $user (keys %qpagedir) + # { + # print "$user: $qpagedir{$user}[0], $qpagedir{$user}[1]\n"; + # } + } |
|
From: Jim T. <tr...@us...> - 2005-03-25 17:39:41
|
Update of /cvsroot/mon/mon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11788 Modified Files: Tag: mon-1-0-0pre1 mon Log Message: two fixes: Date: Thu, 24 Mar 2005 21:29:07 -0800 (PST) From: Michael Vogt <m_p...@ya...> To: mo...@li... Subject: BUG: alertevery filtering fails because empty summary fails match with previous empty summary Date: Thu, 24 Mar 2005 22:30:49 -0800 (PST) From: Michael Vogt <m_p...@ya...> To: mo...@li... Subject: Bug: mon.cf keyword error in period section not detected Index: mon =================================================================== RCS file: /cvsroot/mon/mon/mon,v retrieving revision 1.4.2.16 retrieving revision 1.4.2.17 diff -C2 -d -r1.4.2.16 -r1.4.2.17 *** mon 11 Mar 2005 13:13:15 -0000 1.4.2.16 --- mon 25 Mar 2005 17:39:30 -0000 1.4.2.17 *************** *** 599,602 **** --- 599,603 ---- # my ($prevsumm) = split("\n", $sref->{"_failure_output"}); + $prevsumm = "(NO SUMMARY)" if ($prevsumm =~ /^\s*$/m); if ( $pref->{"alertevery"} != 0 && # if alertevery is set and *************** *** 1435,1438 **** --- 1436,1445 ---- next; } + + else + { + close (CFG); + return "cf error: unknown syntax [$l], line $line_num"; + } } |
|
From: Jim T. <tr...@us...> - 2005-03-18 19:25:36
|
Update of /cvsroot/mon/mon-contrib/monitors/diskspace/netsnmp-freespace In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30001 Modified Files: netsnmp-freespace.monitor Log Message: Date: Tue, 11 Jan 2005 20:52:10 -0500 From: Ed Ravin <er...@pa...> To: mo...@li... Subject: minor fix for freespace monitors to hide community name Two patches for free space monitors, to give them the same feature: the ability to specify an SNMP community name in the environment, and thus not display it in the command line for peering eyes to see in the Mon interface (with the name of the monitor program in the details view). Index: netsnmp-freespace.monitor =================================================================== RCS file: /cvsroot/mon/mon-contrib/monitors/diskspace/netsnmp-freespace/netsnmp-freespace.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** netsnmp-freespace.monitor 18 Feb 2005 17:52:24 -0000 1.1.1.1 --- netsnmp-freespace.monitor 18 Mar 2005 19:25:27 -0000 1.2 *************** *** 44,48 **** getopts("c:"); ! $community = $opt_c || 'public'; $RETVAL = 0; --- 44,48 ---- getopts("c:"); ! $community = $opt_c || $ENV{'COMMUNITY'} || 'public'; $RETVAL = 0; |
|
From: Jim T. <tr...@us...> - 2005-03-18 19:25:06
|
Update of /cvsroot/mon/mon-contrib/monitors/diskspace/snmpdiskspace In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29578 Modified Files: snmpdiskspace.monitor snmpdiskspace.cf Log Message: Date: Thu, 13 Jan 2005 19:44:32 -0500 From: Ed Ravin <er...@pa...> To: Ed Ravin <er...@pa...>, mo...@li... Subject: new snmpdisk.monitor - monitors inodes, other improvements On Tue, Jan 11, 2005 at 08:56:49PM -0500, Ed Ravin wrote: > Has anyone hacked any of the disk space monitors to monitor inode > consumption? [...] Oh well, I had to do my own hacking. Along the way, I fixed a few things and added a few new features. If you're using this monitor, I encourage you to try this version and let me know how it works for you. Even if you don't need the inode monitoring feature, you will probably like the new "--listall" feature that shows exactly which filesystems are monitored and what the thresholds are for that filesystem (i.e. a good way to debug your config file). To monitor inodes, you need a recent net-snmp (I'm using 5.2.1.rc2, 5.2.1.rc3 just came out and should be just as good), you need to add the line "includeAllDisks" into snmpd.conf (or manually add a "disk" entry for each filesystem you want monitored, but who's got time for that?), and you need to run this monitor with the "--usemib ucd" option. To change the inode monitoring threshold (default 5%), add a 4th column into the config file as needed. Summary of changes: New stuff: * monitors inode usage (with "--usemib ucd" option and 4th column in config file) * choose which MIB you want to use ("--usemib" option) * list out all monitored filesystems, with the parameters for alarming. This shows you exactly what the thresholds are for each filesystem. * debug output ("--debug" option) Changed stuff: * all failure messages now prefixed with the hostname as per normal Mon style. Also, failure messages now also display the threshold so you can tell from the failure message what level you were testing for. * when using the UCD MIB, no longer fails if the agent has a "sparse MIB" * recognize more devices as local disk in UCD MIB. Bug: this should be a configurable option. * added --ifree option to set default inode threshold if needed. Index: snmpdiskspace.cf =================================================================== RCS file: /cvsroot/mon/mon-contrib/monitors/diskspace/snmpdiskspace/snmpdiskspace.cf,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** snmpdiskspace.cf 18 Feb 2005 17:52:24 -0000 1.1.1.1 --- snmpdiskspace.cf 18 Mar 2005 19:24:54 -0000 1.2 *************** *** 4,8 **** # format: # ! # host filesys free # # The monitor script uses a "first match" algorithm. So put your more --- 4,8 ---- # format: # ! # host filesys free ifree # # The monitor script uses a "first match" algorithm. So put your more *************** *** 26,36 **** # "0" turns of checking for the filesystem/disk. # # Examples: ! # * * 10% ! # Give a warning when the free space goes below 10 % # (This is the default behavior of the monitor) # This should always be the last line in your config file # because it will match everything. # # ior * 15% # On the host ior the limit is 15% --- 26,47 ---- # "0" turns of checking for the filesystem/disk. # + # ifree Percentage of free inodes, below which will trigger a failure. + # Expressed as "5%". The host must support the UCD dskTable MIB. + # + # + # BE SURE TO TEST your configuration with the "--listall" option! + # This way, you will see exactly what filesystems are found by the script, + # and what their alarm thresholds will be. + # # Examples: ! # * * 5% ! # Give a warning when the free space goes below 5 % # (This is the default behavior of the monitor) # This should always be the last line in your config file # because it will match everything. # + # * * 5% 10% + # As above, but also warn if free inodes drops below 10%. + # # ior * 15% # On the host ior the limit is 15% Index: snmpdiskspace.monitor =================================================================== RCS file: /cvsroot/mon/mon-contrib/monitors/diskspace/snmpdiskspace/snmpdiskspace.monitor,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** snmpdiskspace.monitor 18 Feb 2005 17:52:24 -0000 1.1.1.1 --- snmpdiskspace.monitor 18 Mar 2005 19:24:53 -0000 1.2 *************** *** 8,12 **** # snmpdiskspace.monitor [--list] [--timeout seconds] [--config filename] # [--community string] [--free minfree] ! # [--retries retries] host... # # --- 8,12 ---- # snmpdiskspace.monitor [--list] [--timeout seconds] [--config filename] # [--community string] [--free minfree] ! # [--retries retries] [--usemib <mibtype>] host... # # *************** *** 48,54 **** --- 48,66 ---- # example, "20%", "1gb", "50mb" are all valid. # Default is 5% free on every partition checked. + # + # --ifree The default minimum free inode percentage, specified as + # a percentage. Default is 5% free. + # # --list Give a verbose listing of all partitions checked on all # specified hosts. # + # --listall like --list, but also lists the thresholds defined for + # each filesystem, so you can doublecheck the config file + # + # --usemib Choose which MIB to use: one or more of host, perf, ucd + # Default tries all three, in that order + # + # --debug enable debug output for config file parsing and MIB fetching + # # # EXIT STATUS *************** *** 62,69 **** --- 74,98 ---- # detected, exit status is 1. # + # BUGS + # When using the net-snmp agent, you must build it with "--with-dummy-values" + # or the monitor may not parse the Host Resources MIB properly. + # + # List of local filesystem types used when parsing the UCD MIB should be + # configurable. + # # # NOTES # $Id$ # + # * Added support for inode status via UCD-SNMP MIB. Fourth column in config + # file (optional) is for inode%. + # * added --debug and --usemib options. Latter needed so you can force use + # of UCD mib if you want inode status. + # * rearranged the error messages to be more Mon-like (hostname first) + # * added code to synchronize instance numbers when using UCD MIB. This + # could solve the "sparse MIB" problem usually fixed by the + # --with-dummy-values option in net-snmp if needed for other agents + # Ed Ravin (er...@pa...), January 2005 + # # Added support for regex hostnames and partition names in the config file, # 'use strict' by andrew ryan <an...@na...>. *************** *** 114,123 **** # setup what mibs to use ! $ENV{"MIBS"} = 'RFC1213-MIB:HOST-RESOURCES-MIB:WINDOWS-NT-PERFORMANCE:UCD-SNMP-MIB'; my %opt; # parse the commandline ! GetOptions (\%opt, "community=s", "timeout=i", "retries=i", "config=s", "list", "free=i"); die "No host arguments given!\n" if (@ARGV == 0); --- 143,153 ---- # setup what mibs to use ! # $ENV{"MIBS"} = 'RFC1213-MIB:HOST-RESOURCES-MIB:WINDOWS-NT-PERFORMANCE:UCD-SNMP-MIB'; ! $ENV{"MIBS"} = 'RFC1213-MIB:HOST-RESOURCES-MIB:UCD-SNMP-MIB'; my %opt; # parse the commandline ! GetOptions (\%opt, "community=s", "timeout=i", "retries=i", "config=s", "list", "listall", "free=i", "ifree=n", "usemib=s", "debug"); die "No host arguments given!\n" if (@ARGV == 0); *************** *** 130,142 **** # Read in defaults ! my $COMM = $opt{"community"} || "public"; my $TIMEOUT = $opt{"timeout"} * 100000 || 2000000; #default timeout is 20 seconds my $RETRIES = $opt{"retries"} || 5; my $CONFIG = $opt{"config"} || (-d "/etc/mon" ? "/etc/mon" : "/usr/lib/mon/mon.d") . "/snmpdiskspace.cf"; ! my $DISKFREE = $opt{"free"} || -10; #default max % full is 90% ! my ($host, $checkval, %FREE, $disk, @disklist, $cfgline); # read the config file --- 160,178 ---- # Read in defaults ! my $COMM = $opt{"community"} || $ENV{"COMMUNITY"} || "public"; my $TIMEOUT = $opt{"timeout"} * 100000 || 2000000; #default timeout is 20 seconds my $RETRIES = $opt{"retries"} || 5; my $CONFIG = $opt{"config"} || (-d "/etc/mon" ? "/etc/mon" : "/usr/lib/mon/mon.d") . "/snmpdiskspace.cf"; ! my $DISKFREE = $opt{"free"} || -5; #default max % full is 95% ! my $INODEFREE = $opt{"ifree"} || 5; #default max % inode full is 95% ! my $USEMIB= $opt{"usemib"} || "host perf ucd"; + my $LIST= $opt{"list"} || $opt{"listall"} || 0; + my $LISTALL= $opt{"listall"} || 0; + my $DEBUG= $opt{"debug"} || 0; ! ! my ($host, $checkval, $icheckval, %FREE, $disk, @disklist, $cfgline); # read the config file *************** *** 157,161 **** # Now check each partition foreach $disk (@disklist) { ! undef $checkval ; #clear the value of $checkval # Go through the config file line by line until we --- 193,198 ---- # Now check each partition foreach $disk (@disklist) { ! undef $checkval ; ! undef $icheckval ; # Go through the config file line by line until we *************** *** 166,171 **** ($disk->[2] =~ m/^$cfgline->[1]$/) ) { ! #print "'$host' matched /^$cfgline->[0]\$/ or '$disk->[2]' matched /^$cfgline->[1]\$/, using checkval $cfgline->[2]\n"; #DEBUG $checkval = $cfgline->[2] ; last; } --- 203,209 ---- ($disk->[2] =~ m/^$cfgline->[1]$/) ) { ! print STDERR "'$host' matched /^$cfgline->[0]\$/ or '$disk->[2]' matched /^$cfgline->[1]\$/, using checkval $cfgline->[2]\n" if $DEBUG; $checkval = $cfgline->[2] ; + $icheckval= $cfgline->[3] ; last; } *************** *** 174,200 **** # Set to default otherwise $checkval = $DISKFREE unless defined($checkval); # do the checking, first absolute and then percentage ! next if $checkval == 0; # checkval set to 0, ignore this partition if (($checkval > 0) && ($disk->[0] <$checkval)) { ! push (@HOSTS, $host); ! push (@ERRS, sprintf ("ERROR: %s on host %s is (%1.1f%% full), %1.0fMB free", ! $disk->[2] , $host , $disk->[1] , $disk->[0] / 1048576 )); ! $RET = 1; } elsif (($checkval < 0) && ($disk->[1] - $checkval >=100)) { push (@HOSTS, $host); - push (@ERRS, sprintf ("ERROR: %s on host %s is (%1.1f%% full), %1.0fMB free", - $disk->[2] , $host , $disk->[1] , $disk->[0] / 1048576 )); $RET = 1; } # if the user want a listing, then the user will get a listing :-) ! if ($opt{"list"}) { ! write; } - } } ! if ($opt{"list"}) { print "\n\n"; } --- 212,257 ---- # Set to default otherwise $checkval = $DISKFREE unless defined($checkval); + $icheckval= $INODEFREE unless defined($icheckval); + $icheckval=~ s/%$//; # do the checking, first absolute and then percentage ! next if $checkval == 0 && $icheckval == 0; # nothing to check: ignore ! my $hostfailed= 0; if (($checkval > 0) && ($disk->[0] <$checkval)) { ! $hostfailed++; ! push (@ERRS,sprintf("%s: filesystem %s is (%1.1f%% full), %1.0fMB free (below threshold %1.0fMB free)", ! $host , $disk->[2] , $disk->[1] , $disk->[0] / 1048576, $checkval / 1048576 )); } elsif (($checkval < 0) && ($disk->[1] - $checkval >=100)) { + $hostfailed++; + push (@ERRS,sprintf("%s: filesystem %s is (%1.1f%% full), %1.0fMB free (below threshold %s%% free)", + $host , $disk->[2] , $disk->[1] , $disk->[0] / 1048576, abs($checkval) )); + } + + if (($icheckval > 0) && ($disk->[3] ne "N/A") && (100 - $disk->[3]) < $icheckval ) { + $hostfailed++; + push (@ERRS, sprintf ("%s: filesystem %s has %1.1f%% inodes free (below threshold %s%% inodes free)", + $host, $disk->[2], 100 - $disk->[3], $icheckval )); + } + + if ($hostfailed) + { push (@HOSTS, $host); $RET = 1; } # if the user want a listing, then the user will get a listing :-) ! write if ($LIST or $LISTALL); ! if ($LISTALL) { ! printf(" Will alarm if MB free declines below threshold %1.0fMB free\n", $checkval / 1048576) if $checkval > 0; ! printf(" Will alarm if %%free space declines below threshold %1.1f%% free\n", abs($checkval)) if $checkval < 0; ! printf(" No free space alarm defined in config file.\n") if $checkval == 0; ! printf(" Will alarm if %%free inodes declines below %1.1f%%\n", $icheckval) if $icheckval > 0; ! printf(" No %%inodes free alarm defined in config file.\n") if $icheckval == 0; ! printf(" WARNING: Unable to alarm on inodes free, dskPercentNode not found in MIB\n") if $disk->[3] eq "N/A" and $icheckval > 0; ! } } } ! if ($LIST or $LISTALL) { print "\n\n"; } *************** *** 225,229 **** sub readcf { my ($f) = @_; ! my ($l, $host, $filesys, $free); open (CF, $f) || return undef; --- 282,286 ---- sub readcf { my ($f) = @_; ! my ($l, $host, $filesys, $free, $ifree); open (CF, $f) || return undef; *************** *** 231,240 **** next if (/^\s*#/ || /^\s*$/); chomp; ! ($host, $filesys, $free) = split; # if (!defined ($FREE{$host}{$filesys} = toBytes ($free))) { ! if (!push (@cfgfile, [$host , $filesys , toBytes ($free)]) ) { die "error free specification, config $f, line $.\n"; } ! #print "cf: assigned host=$host, filesys=$filesys, free=$free\n"; #DEBUG } close (CF); --- 288,297 ---- next if (/^\s*#/ || /^\s*$/); chomp; ! ($host, $filesys, $free, $ifree) = split; # if (!defined ($FREE{$host}{$filesys} = toBytes ($free))) { ! if (!push (@cfgfile, [$host , $filesys , toBytes ($free), $ifree || 0]) ) { die "error free specification, config $f, line $.\n"; } ! print STDERR "cf: assigned host=$host, filesys=$filesys, free=$free, ifree=$ifree\n" if $DEBUG; } close (CF); *************** *** 275,279 **** my ($host) = @_; ! my (@disklist,$Type,$Descr,$AllocationUnits,$Size,$Used,$Freespace,$Percent); my ($v,$s); --- 332,336 ---- my ($host) = @_; ! my (@disklist,$Type,$Descr,$AllocationUnits,$Size,$Used,$Freespace,$Percent,$InodePercent); my ($v,$s); *************** *** 284,341 **** $RET = ($RET == 1) ? 1 : 2 ; push (@HOSTS, $host); ! push (@ERRS, "could not create session to $host: " . $s->{ErrorStr}); return undef; } - # First we try to use the Host mib (RFC1514) ! # I'm using the Linux implemetation from ! # http://www.ece.ucdavis.edu/ucd-snmp ! # (via the debian package) # # You can also use the Empire (http://www.empire.com) # SNMP agent to provide hostmib support on UNIX and NT. ! $v = new SNMP::VarList ( ! ['hrStorageIndex'], ! ['hrStorageType'], ! ['hrStorageDescr'], ! ['hrStorageAllocationUnits'], ! ['hrStorageSize'], ! ['hrStorageUsed'], ! ); ! while (defined $s->getnext($v)) { ! last if ($v->[0]->tag !~ /hrStorageIndex/); ! ! $Type = $v->[1]->val; ! $Descr = $v->[2]->val; ! $AllocationUnits = $v->[3]->val; ! $Size = $v->[4]->val; ! $Used = $v->[5]->val; - $Freespace = (($Size - $Used) * $AllocationUnits); - #print "Type=$Type, Descr=$Descr, AllocationUnits=$AllocationUnits, Size=$Size, Used=$Used\n"; #DEBUG ! # This next check makes sure we're only looking at storage ! # devices of the "FixedDevice" type (4). For comparison, Physical ! # RAM is 2, Virtual Memory is 3, Floppy Disk is 6, and CD-ROM is 7 ! # Using the Empire agent, this will eliminate drive types other ! # than hard disks. The UCD agent is not as good as determining ! # drive types under the HOST mib. ! next if ($Type !~ /\.1\.3\.6\.1\.2\.1\.25\.2\.1\.4/); ! ! if ($Size != 0) { ! $Percent= ($Used / $Size) * 100.0; ! } else { ! $Percent=0; ! }; ! ! push (@disklist,[$Freespace,$Percent,$Descr]); ! #print STDERR "Pushed $Freespace,$Percent,$Descr onto disklist from host mib\n"; #DEBUG ! }; ! if (@disklist) { ! return @disklist; }; --- 341,400 ---- $RET = ($RET == 1) ? 1 : 2 ; push (@HOSTS, $host); ! push (@ERRS, "$host: could not create session: " . $s->{ErrorStr}); return undef; } # First we try to use the Host mib (RFC1514) ! # supported by net-snmpd on most platforms, see http://www.net-snmp.org # # You can also use the Empire (http://www.empire.com) # SNMP agent to provide hostmib support on UNIX and NT. ! if ($USEMIB =~ /host/i) ! { ! $v = new SNMP::VarList ( ! ['hrStorageIndex'], ! ['hrStorageType'], ! ['hrStorageDescr'], ! ['hrStorageAllocationUnits'], ! ['hrStorageSize'], ! ['hrStorageUsed'], ! ); ! while (defined $s->getnext($v)) { ! last if ($v->[0]->tag !~ /hrStorageIndex/); ! ! $Type = $v->[1]->val; ! $Descr = $v->[2]->val; ! $AllocationUnits = $v->[3]->val; ! $Size = $v->[4]->val; ! $Used = $v->[5]->val; ! $Freespace = (($Size - $Used) * $AllocationUnits); ! print STDERR "Found HOST MIB filesystem: Type=$Type, Descr=$Descr, AllocationUnits=$AllocationUnits, Size=$Size, Used=$Used\n" if $DEBUG; ! ! # This next check makes sure we're only looking at storage ! # devices of the "FixedDevice" type (4). For comparison, Physical ! # RAM is 2, Virtual Memory is 3, Floppy Disk is 6, and CD-ROM is 7 ! # Using the Empire agent, this will eliminate drive types other ! # than hard disks. The UCD agent is not as good as determining ! # drive types under the HOST mib. ! next if ($Type !~ /\.1\.3\.6\.1\.2\.1\.25\.2\.1\.4/); ! ! if ($Size != 0) { ! $Percent= ($Used / $Size) * 100.0; ! } else { ! $Percent=0; ! }; ! ! push (@disklist,[$Freespace,$Percent,$Descr, "N/A"]); ! print STDERR "Using HOST MIB filesystem: $Descr ($Type)\n" if $DEBUG; ! }; ! ! if (@disklist) { ! return @disklist; ! }; }; *************** *** 348,403 **** # the bad ones ! $v = new SNMP::VarList ( ! ['ldisklogicalDiskIndex'], ! ['ldiskPercentFreeSpace'], ! ['ldiskPercentFreeSpace'], ! ['ldiskFreeMegabytes'], ! ['ldiskFreeMegabytes'], ! ); ! while (defined $s->getnext($v)) { ! # Make sure we are still in relevant portion of MIB ! last if ($v->[1]->val !~ /^\.1\.3\.6\.1\.2\.1\.25\.2\.1\.4/); ! last if ($v->[0]->val =~ /Total/); ! ! $Descr = ( $v->[0]->val =~ /.*:.*:(\w+:)$/gi)[-1] ; ! $Percent = $v->[2]->val; ! $Freespace = $v->[4]->val * 1024 * 1024; ! ! push (@disklist,[$Freespace,$Percent,$Descr]); ! #print STDERR "Pushed $Freespace,$Percent,$Descr onto disklist from perfmib\n"; #DEBUG ! }; ! if (@disklist) { ! return @disklist; } #Try UCD-SNMP .enterprises.ucdavis.dskTable.dskEntry MIB extrnsion ! # Comes with UCD-SNMP ! $v = new SNMP::VarList ( ! ['dskIndex'], ! ['dskPath'], ! ['dskPercent'], ! ['dskAvail'], ! ['dskDevice'], ! ); ! while (defined $s->getnext($v)) { ! last if ($v->[0]->tag !~ /dskIndex/); ! $Descr = $v->[1]->val; ! $Percent = $v->[2]->val; ! $Freespace = $v->[3]->val; ! $Freespace *= 1024; #Convert from kbytes to bytes to make consistent ! $Type = $v->[4]->val; ! # Only check disk types RAID, IDE, SCSI, and Proliant RAID partitions ! next unless ( $Type =~ m/md|hd|sd|ida/ ) ; ! #print "Pushed $Freespace,$Percent,$Descr onto disklist from host mib\n"; #DEBUG ! push (@disklist,[$Freespace,$Percent,$Descr]); ! }; ! if (@disklist) { ! return @disklist; } --- 407,497 ---- # the bad ones ! if ($USEMIB =~ /perf/i) ! { ! $v = new SNMP::VarList ( ! ['ldisklogicalDiskIndex'], ! ['ldiskPercentFreeSpace'], ! ['ldiskPercentFreeSpace'], ! ['ldiskFreeMegabytes'], ! ['ldiskFreeMegabytes'], ! ); ! ! while (defined $s->getnext($v)) { ! # Make sure we are still in relevant portion of MIB ! last if ($v->[1]->val !~ /^\.1\.3\.6\.1\.2\.1\.25\.2\.1\.4/); ! last if ($v->[0]->val =~ /Total/); ! ! $Descr = ( $v->[0]->val =~ /.*:.*:(\w+:)$/gi)[-1] ; ! $Percent = $v->[2]->val; ! $Freespace = $v->[4]->val * 1024 * 1024; ! ! push (@disklist,[$Freespace,$Percent,$Descr, "N/A"]); ! print STDERR "Using PERF MIB filesystem: $Descr, $Freespace,$Percent\n" if $DEBUG; ! }; ! if (@disklist) { ! return @disklist; ! } } #Try UCD-SNMP .enterprises.ucdavis.dskTable.dskEntry MIB extrnsion ! # Comes with UCD-SNMP / net-snmp ! if ($USEMIB =~ /ucd/i) ! { ! $v = new SNMP::VarList ( ! ['dskIndex'], ! ['dskPath'], ! ['dskPercent'], ! ['dskAvail'], ! ['dskDevice'], ! ['dskPercentNode'], ! ); ! while (defined $s->getnext($v)) { ! last if ($v->[0]->tag !~ /dskIndex/); # end of MIB? ! my $instancenum= $v->[0]->iid; # what instance number? ! # check for partial fetches (like swap partition) that won't ! # return all the MIB entries ! if ($v->[2]->iid != $instancenum or ! $v->[3]->iid != $instancenum or ! $v->[5]->iid != $instancenum) ! { ! # ignore this instance and try to move on to next ! # we wouldn't need this if use-dummy-values really worked ! $v = new SNMP::VarList ( ! ['dskIndex', $instancenum], ! ['dskPath', $instancenum], ! ['dskPercent', $instancenum], ! ['dskAvail', $instancenum], ! ['dskDevice', $instancenum], ! ['dskPercentNode', $instancenum], ! ); ! next; ! } ! ! $Descr = $v->[1]->val; ! $Percent = $v->[2]->val; ! $Freespace = $v->[3]->val; ! $Freespace *= 1024; #Convert from kbytes to bytes to make consistent ! $Type = $v->[4]->val; ! $InodePercent = $v->[5]->val; ! ! print STDERR "Found UCD MIB filesystem: Type=$Type, Descr=$Descr, Percent=$Percent, Freespace=$Freespace, InodePercent=$InodePercent\n" if $DEBUG; ! ! # Try to catch only local filesystems. This covers the ! # the basics, but probably should be configurable ! next unless ( $Type =~ m/\b(md|hd|wd|sd|ida|raid)/ ) ; ! ! print STDERR "Using UCD MIB filesystem: $Descr ($Type)\n" if $DEBUG; ! push (@disklist,[$Freespace,$Percent,$Descr, $InodePercent]); ! }; ! ! if (@disklist) { ! return @disklist; ! } } *************** *** 405,409 **** if ($s->{ErrorNum}) { push (@HOSTS, $host); ! push (@ERRS, "could not get SNMP info for $host: " . $s->{ErrorStr}); $RET = ($RET == 1) ? 1 : 2 ; return undef; --- 499,503 ---- if ($s->{ErrorNum}) { push (@HOSTS, $host); ! push (@ERRS, "$host: could not get SNMP info: " . $s->{ErrorStr}); $RET = ($RET == 1) ? 1 : 2 ; return undef; *************** *** 412,416 **** # Check for OID not found push (@HOSTS, $host); ! push (@ERRS, "Disk space OIDs not found for $host"); $RET = ($RET == 1) ? 1 : 2 ; return undef; --- 506,510 ---- # Check for OID not found push (@HOSTS, $host); ! push (@ERRS, "$host: Disk space OIDs not found in MIB(s): $USEMIB"); $RET = ($RET == 1) ? 1 : 2 ; return undef; *************** *** 420,429 **** # format specifications, should be able to cut, paste and edit into a config file format STDOUT_TOP = ! System Description % Used Free space ! ------------------------------------------------------------------------ . format STDOUT = ! @<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<<<<< @###.# % @#######.# mb ! $host, $disk->[2], $disk->[1], $disk->[0]/1024/1024 . --- 514,523 ---- # format specifications, should be able to cut, paste and edit into a config file format STDOUT_TOP = ! System Description % Used Free space Inode% ! ------------------------------------------------------------------------------- . format STDOUT = ! @<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<<<<< @###.# % @#######.# mb @>>>>>> ! $host, $disk->[2], $disk->[1], $disk->[0]/1024/1024, ( $disk->[3] ne "N/A" ? ($disk->[3] + 0) . "%" : "N/A") . |
|
From: Jim T. <tr...@us...> - 2005-03-11 13:13:33
|
Update of /cvsroot/mon/mon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17261 Modified Files: Tag: mon-1-0-0pre1 mon Log Message: fixed prob where ip addr of trap source doesn't show ip in syslog msg make -O actually work started some code for posalerts removed remnants of on-call schedule stuff that never worked in the first place set MON_GROUP and MON_SERVICE env vars when running a monitor Index: mon =================================================================== RCS file: /cvsroot/mon/mon/mon,v retrieving revision 1.4.2.15 retrieving revision 1.4.2.16 diff -C2 -d -r1.4.2.15 -r1.4.2.16 *** mon 18 Jan 2005 20:44:45 -0000 1.4.2.15 --- mon 11 Mar 2005 13:13:15 -0000 1.4.2.16 *************** *** 225,229 **** } ! if ($^O eq "linux" || $^O =~ /^(open|free|net)bsd\$/ || $^O eq "aix") { Sys::Syslog::setlogsock ('unix'); --- 225,229 ---- } ! if ($^O eq "linux" || $^O =~ /^(open|free|net)bsd$/ || $^O eq "aix") { Sys::Syslog::setlogsock ('unix'); *************** *** 1423,1426 **** --- 1423,1438 ---- next; } + + elsif ($var eq "posalerts") + { + $pref->{"_posalerts"} = 1; + # + # set this sref var so there's no need to search through the list of + # periods to check if one has posalerts set + # + $sref->{"_posalerts_exist"} = 1; + + next; + } } *************** *** 2742,2746 **** -m num throttle at maximum number of monitor processes -O facility syslog facility to use - -o file on-call schedule -p num server listens on port num -P file PID file --- 2754,2757 ---- *************** *** 3210,3213 **** --- 3221,3226 ---- $ENV{"MON_LOGDIR"} = $CF{"LOGDIR"}; $ENV{"MON_CFBASEDIR"} = $CF{"CFBASEDIR"}; + $ENV{"MON_GROUP"} = $group; + $ENV{"MON_SERVICE"} = $service; if (!exec @args) *************** *** 3797,3801 **** my ($port, $addr) = sockaddr_in ($from); ! my $fromip = inet_ntoa ($addr); # --- 3810,3814 ---- my ($port, $addr) = sockaddr_in ($from); ! $fromip = inet_ntoa ($addr); # *************** *** 4278,4282 **** $CF{"HISTORICTIME"} = 0; $CF{"DEP_RECUR_LIMIT"} = 10; ! $CF{"SYSLOG_FACILITY"} = "daemon"; $CF{"STARTUPALERTS_ON_RESET"} = 0; } --- 4291,4295 ---- $CF{"HISTORICTIME"} = 0; $CF{"DEP_RECUR_LIMIT"} = 10; ! $CF{"SYSLOG_FACILITY"} = $opt{"O"} || "daemon"; $CF{"STARTUPALERTS_ON_RESET"} = 0; } |
|
From: Jim T. <tr...@us...> - 2005-03-11 13:10:48
|
Update of /cvsroot/mon/mon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16529 Modified Files: mon Log Message: fixed prob where ip addr of trap source doesn't show ip in syslog msg Index: mon =================================================================== RCS file: /cvsroot/mon/mon/mon,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mon 17 Feb 2005 14:07:39 -0000 1.11 --- mon 11 Mar 2005 13:10:33 -0000 1.12 *************** *** 4228,4232 **** my ($port, $addr) = sockaddr_in ($from); ! my $fromip = inet_ntoa ($addr); # --- 4228,4232 ---- my ($port, $addr) = sockaddr_in ($from); ! $fromip = inet_ntoa ($addr); # |
|
From: David N. <vi...@us...> - 2005-02-19 17:48:16
|
Update of /cvsroot/mon/mon-contrib/monitors/tftp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11336 Added Files: tftp.monitor Log Message: Adding tftp monitoring script --- NEW FILE: tftp.monitor --- #!/usr/bin/perl -w # # This TFTP test script will attempt to fetch a file from a tftp server, # and will verify it receives a non-empty file. # # Requires Net::TFTP # # Arguments: '-f filename hostname [...]' # # Author: David Nolan, Carnegie Mellon University, Computing Services # Contact: ne...@an... # # Copyright (c) 2002 Carnegie Mellon University. All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: # # 1. Redistributions of source code must retain the above copyright notice, # this list of conditions and the following disclaimer. # # 2. Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # 3. The name "Carnegie Mellon University" must not be used to endorse or # promote products derived from this software without prior written # permission. For permission or any legal details, please contact: # Office of Technology Transfer # Carnegie Mellon University # 5000 Forbes Avenue # Pittsburgh, PA 15213-3890 # (412) 268-4387, fax: (412) 268-7395 # tec...@an... # # 4. Redistributions of any form whatsoever must retain the following # acknowledgment: "This product includes software developed by Computing # Services at Carnegie Mellon University (http://www.cmu.edu/computing/)." # # CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS # SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, # IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR ANY SPECIAL, # INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM # LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. use Net::TFTP; use Getopt::Std; getopt('f'); if (!defined $opt_f) { print "\nNo file to fetch, aborting.\n"; exit 0; } foreach $host (@ARGV) { eval { if (-f "/tmp/tftp.$$") { unlink "/tmp/tftp.$$"; } my $tftp = Net::TFTP->new($host, BlockSize => 1024); $tftp->ascii; $tftp->get($opt_f, "/tmp/tftp.$$"); my $err = $tftp->error; if ($err) { push @failures, $host; push @longerr, "$host: TFTP error $err"; } else { my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) = stat("/tmp/tftp.$$"); if (!$size) { push @failures, $host; push @longerr, "$host: Zero length file received"; } } }; if ($EVAL_ERROR && ($EVAL_ERROR =~ /Timeout/ )) { push @failures, $host; push @longerr, "$host: Request timed out."; } elsif ($EVAL_ERROR) { push @longerr, "$host: $EVAL_ERROR"; push @failures, $host; } } if (-f "/tmp/tftp.$$") { unlink "/tmp/tftp.$$"; } if (!@failures) { exit 0; } print join(" ", @failures),"\n"; print join("\n", @longerr), "\n"; exit scalar @failures; |
5 messages has been excluded from this view by a project administrator.
