diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/CHANGES /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/CHANGES --- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/CHANGES 2008-05-31 13:10:37.000000000 -0400 +++ /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/CHANGES 2008-10-25 11:30:36.000000000 -0400 @@ -1,5 +1,5 @@ -* Current +* Version 3.6 [2008 Oct 27] SNMP interface auto-discovery (oid: ifInOctets[POS1/0]) better handling of solaris low descriptor limit faster startup diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/Makefile.tplt /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/Makefile.tplt --- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/Makefile.tplt 2008-08-10 18:27:47.000000000 -0400 +++ /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/Makefile.tplt 2008-10-25 11:31:46.000000000 -0400 @@ -3,10 +3,10 @@ # Created: 2002-Jun-27 # Function: Makefile template # -# $Id: Makefile.tplt,v 1.180 2008/08/10 22:27:47 jaw Exp $ +# $Id: Makefile.tplt,v 1.181 2008/10/25 15:31:46 jaw Exp $ -VERSION = dev-20080810 -MESSAGE = This is unstable development code +VERSION = 3.6 +MESSAGE = INSTALL = please see the INSTALL document for the next steps UPGRADE1 = be sure to install the new misc/argus.css and misc/argus.js files UPGRADE2 = this version may require changes to your config file. diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/THANKSTO /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/THANKSTO --- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/THANKSTO 2007-02-13 22:25:37.000000000 -0500 +++ /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/THANKSTO 2008-09-14 11:37:05.000000000 -0400 @@ -20,6 +20,7 @@ Lionel Duda - translation Aidas Kasparas - translation Marco Davids - translation +Tigran Zakoyan - translation Authors of "Whats Up Gold" - their shortcomings made me want to write this code diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/locale/ru_RU /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/locale/ru_RU --- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/locale/ru_RU 1969-12-31 19:00:00.000000000 -0500 +++ /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/locale/ru_RU 2008-09-14 10:58:22.000000000 -0400 @@ -0,0 +1,242 @@ + +# set the character set that the language uses + +charset "KOI8-R" + +# set the value of the language code, these are normally +# 2 letters for the language, and 2 letters for the country +# for example: "de_at" is the german (de) language, as spoken in austria (at) + +lang "ru_RU" + + +# set the abbreviated names of the days and months +# for example: +# days Sun Mon Tue Wed Thu Fri Sat +# months Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec + +days Вс Пн Вт Ср Чт Пт Сб +months Янв Фев Мар Апр Май Июн Июл Авг Сен Окт Ноя Дек + +# translations of various words and phrases +# each phrase consist of 2 lines, one with the english (msgid) +# and one with the translation (msgstr) +# for example: +# msgid "the english phrase" +# msgstr "the translated phrase" + +# leave the "msgid" (english) lines as is, and add lines +# for the translations (msgstr) + +msgid "Today" +msgstr "Сегодня" + +msgid "This Month" +msgstr "За месяц" + +msgid "This Year" +msgstr "За год" + +msgid "Yesterday" +msgstr "Вчера" + +msgid "Last Month" +msgstr "Прошлый месяц" + +msgid "Last Year" +msgstr "Прошлый год" + +msgid "2 Days Ago" +msgstr "Два дня назад" + +msgid "2 Months Ago" +msgstr "2 месяца назад" + +msgid "2 Years Ago" +msgstr "2 года назад" + +msgid "3 Days Ago" +msgstr "3 дня назад" + +msgid "3 Months Ago" +msgstr "3 месяца назад" + +msgid "3 Years Ago" +msgstr "3 года назад" + +msgid "Annotate" +msgstr "Примечание" + +msgid "Annotation" +msgstr "Примечание" + +msgid "Remove Annotation" +msgstr "Удалить примечание" + +msgid "Comment" +msgstr "Комментарий" + +msgid "Debugging" +msgstr "Отладка" + +msgid "Display Config" +msgstr "Показать конфигурацию" + +msgid "Down" +msgstr "Выкл" + +msgid "Error Log" +msgstr "Журнал сбоев" + +msgid "Expires" +msgstr "Истекает" + +msgid "Flush Cache" +msgstr "Очистить кэш" + +msgid "Hush Siren" +msgstr "Отключить сирену" + +msgid "Login" +msgstr "Вход" + +msgid "Logout" +msgstr "Выход" + +msgid "Mode" +msgstr "Режим" + +msgid "Name" +msgstr "Имя" + +msgid "Notifications" +msgstr "Уведомления" + +msgid "Notifies" +msgstr "Уведомления" + +msgid "Override" +msgstr "Заглушить" + +msgid "Password" +msgstr "Пароль" + +msgid "Please log in" +msgstr "Пожалуйста представьтесь" + +msgid "Status" +msgstr "Статус" + +msgid "Un-Acked Notifies" +msgstr "Невостребованные уведомления" + +msgid "Up" +msgstr "Вкл" + +msgid "User" +msgstr "Пользователь" + +msgid "Username" +msgstr "Имя пользователя" + +msgid "auto mode - disengage override when status returns to up" +msgstr "Автоматический режим - убрать заглушку после смены статуса на Вкл" + +msgid "because" +msgstr "так как" + +msgid "command" +msgstr "команда" + +msgid "down since" +msgstr "Выкл с" + +msgid "down" +msgstr "Выкл" + +msgid "elapsed time" +msgstr "прошло времени" + +msgid "flags" +msgid "флаги" + +msgid "hostname" +msgid "имя хоста" + +msgid "manual mode - require override be disengaged manually" +msgstr "Ручной режим - заглушка должна быть убрана вручную" + +msgid "name" +msgstr "имя" + +msgid "override" +msgstr "заглушка" + +msgid "port" +msgstr "порт" + +msgid "start" +msgstr "запуск" + +msgid "status" +msgstr "статус" + +msgid "times down" +msgstr "раз Выкл" + +msgid "up since" +msgstr "Вкл с" + +msgid "up" +msgstr "Вкл" + +msgid "Authentication Failed" +msgstr "Авторизация не удалась" + +msgid "ERROR" +msgstr "ОШИБКА" + +msgid "Ack Checked" +msgstr "Запрос проверен" + +msgid "Ack All" +msgstr "Востребовать все" + +msgid "There are no un-acked notifications" +msgstr "Нет невостребованных уведомлений" + +msgid "There are no notifications" +msgstr "Нет уведомлений" + +msgid "Unacked Notifications" +msgstr "Невостребованные уведомления" + +msgid "Broken Alias" +msgstr "Несуществующий алиас" + +msgid "is down" +msgstr "выключен" + +msgid "zone" +msgstr "зона" + +msgid "info" +msgstr "инфо" + +msgid "note" +msgstr "заметка" + +msgid "comment" +msgstr "комментарий" + +msgid "annotation" +msgstr "примечание" + +msgid "details" +msgstr "детали" + +msgid "TRANSITION" +msgstr "ПЕРЕХОД" + +msgid "Check Now" +msgstr "Проверить" diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/src/Argus::Graph::Data.pm /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/src/Argus::Graph::Data.pm --- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/src/Argus::Graph::Data.pm 2007-01-27 16:34:34.000000000 -0500 +++ /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/src/Argus::Graph::Data.pm 2008-09-14 11:37:55.000000000 -0400 @@ -5,7 +5,7 @@ # Date: 2002-Nov-01 15:57 (EST) # Function: misc graph data handling # -# $Id: Argus::Graph::Data.pm,v 1.14 2007/01/27 21:34:34 jaw Exp $ +# $Id: Argus::Graph::Data.pm,v 1.15 2008/09/14 15:37:55 jaw Exp $ package Argus::Graph::Data; use strict; @@ -50,7 +50,8 @@ my $c = shift; my $name = shift; - $c->new_file( $name, "$::datadir/gdata/$name" ); + my $file = ($name =~ /^\//) ? $name : "$::datadir/gdata/$name"; + $c->new_file( $name, $file ); } sub new_file { @@ -66,7 +67,7 @@ my $fh = anon_fh(); $me->{fd}= $fh; open( $fh, $file ) - || return ::error( "'$name' is stubborn and refuses to open: $!" ); + || return ::error( "'$file' is stubborn and refuses to open: $!" ); binmode $fh; # read file header diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/src/Doc.pm /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/src/Doc.pm --- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/src/Doc.pm 2007-06-13 22:00:19.000000000 -0400 +++ /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/src/Doc.pm 2008-10-25 11:31:47.000000000 -0400 @@ -5,7 +5,7 @@ # Date: 2002-Apr-04 14:38 (EST) # Function: handle documentation # -# $Id: Doc.pm,v 1.25 2007/06/14 02:00:19 jaw Exp $ +# $Id: Doc.pm,v 1.26 2008/10/25 15:31:47 jaw Exp $ # maintain and validate internal documentation # export it if requested @@ -138,6 +138,7 @@ if( $ver =~ /dev-(\d+)/ ){ my $date = $1; + return '3.6' if $date ge '20081027'; return '3.5' if $date ge '20070614'; return '3.4' if $date ge '20050514'; return '3.3' if $date ge '20040323'; diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/src/MonEl.pm /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/src/MonEl.pm --- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/src/MonEl.pm 2008-08-10 18:27:50.000000000 -0400 +++ /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/src/MonEl.pm 2008-10-25 12:34:53.000000000 -0400 @@ -5,7 +5,7 @@ # Date: 2002-Apr-02 17:11 (EST) # Function: Monitor Element class # -# $Id: MonEl.pm,v 1.162 2008/08/10 22:27:50 jaw Exp $ +# $Id: MonEl.pm,v 1.164 2008/10/25 16:34:53 jaw Exp $ package MonEl; @ISA = qw(Configable); @@ -935,8 +935,8 @@ }; # add in severity based notification params -for my $sev qw(critical major minor warning){ - for my $p qw(renotify autoack escalate ack_on_better ack_on_worse){ +for my $sev (qw(critical major minor warning)){ + for my $p (qw(renotify autoack escalate ack_on_better ack_on_worse)){ # none of these are applicable for 'up/clear' my %d = %{ $doc->{fields}{"notify::$p"} }; $d{versn} = '3.6'; @@ -947,8 +947,8 @@ } delete $doc->{fields}{'notify::ack_on_worse.critical'}; -for my $sev qw(critical major minor warning clear){ - for my $p qw(siren web::icon notify::notify notify::sendnotify){ +for my $sev (qw(critical major minor warning clear)){ + for my $p (qw(siren web::icon notify::notify notify::sendnotify)){ my %d = %{ $doc->{fields}{$p} }; $d{versn} = '3.6'; $d{descr} .= ($sev eq 'clear') ? " when up/$sev" : " when down/$sev"; @@ -1871,15 +1871,16 @@ my @g = $x->graphlist(); my $ht = graph_height(\@g); $ctl->write( "gr_height: $ht\n" ) if $ht; - $ctl->write( "list: ". join(' ', map {$_->[0]->pathname()} @g) . "\n" ); - $ctl->write( "clabels: ". join(' ', map {encode($_->[1])} @g) . "\n" ); - $ctl->write( "header: ". encode("$x->{web}{header_all} $x->{web}{header}") . "\n"); - $ctl->write( "footer: ". encode("$x->{web}{footer} $x->{web}{footer_all} " . - "$x->{web}{footer_argus}") . "\n"); - $ctl->write( "bkgimg: ". encode($x->{web}{bkgimage}) . "\n"); + $ctl->write( "list: ". join(' ', map {$_->[0]->pathname()} @g) . "\n" ); + $ctl->write( "clabels: ". join(' ', map {encode($_->[1])} @g) . "\n" ); + $ctl->write( "header: ". encode("$x->{web}{header_all} $x->{web}{header}") . "\n"); + $ctl->write( "footer: ". encode("$x->{web}{footer} $x->{web}{footer_all} " . + "$x->{web}{footer_argus}") . "\n"); + $ctl->write( "refresh: ". encode($x->{web}{refresh}) . "\n"); + $ctl->write( "bkgimg: ". encode($x->{web}{bkgimage}) . "\n"); $ctl->write( "style_sheet: ". encode($x->{web}{style_sheet}) . "\n"); - $ctl->write( "icon: ". encode($x->{web}{icon}) . "\n"); - $ctl->write( "picasso: ". encode(::topconf('picasso_prog')) . "\n") + $ctl->write( "icon: ". encode($x->{web}{icon}) . "\n"); + $ctl->write( "picasso: ". encode(::topconf('picasso_prog')) . "\n") if ::topconf('picasso_prog'); foreach my $k (keys %{$x->{image}} ){ diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/src/Notify.pm /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/src/Notify.pm --- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/src/Notify.pm 2008-06-25 12:03:18.000000000 -0400 +++ /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/src/Notify.pm 2008-10-25 12:34:53.000000000 -0400 @@ -5,7 +5,7 @@ # Date: 2002-Apr-12 20:06 (EDT) # Function: Tell someone what happened # -# $Id: Notify.pm,v 1.75 2008/06/25 16:03:18 jaw Exp $ +# $Id: Notify.pm,v 1.76 2008/10/25 16:34:53 jaw Exp $ package Notify; use NotMe; @@ -785,7 +785,7 @@ } $ctl->write( "object: " . encode( $p->{obj}->unique() ) . "\n" ); - for my $e qw(style_sheet javascript bkgimage icon icon_up icon_down){ + for my $e (qw(style_sheet javascript bkgimage icon icon_up icon_down)){ my $v = $p->{obj}->{web}{$e}; next unless $v; $ctl->write("web $e: " . encode($v) . "\n"); diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/src/Service.pm /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/src/Service.pm --- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/src/Service.pm 2008-06-25 12:03:18.000000000 -0400 +++ /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/src/Service.pm 2008-10-25 12:34:53.000000000 -0400 @@ -5,7 +5,7 @@ # Date: 2002-Apr-03 08:56 (EST) # Function: the service class # -# $Id: Service.pm,v 1.117 2008/06/25 16:03:18 jaw Exp $ +# $Id: Service.pm,v 1.119 2008/10/25 16:34:53 jaw Exp $ package Service; @ISA = qw(MonEl BaseIO); @@ -295,10 +295,10 @@ }, }; -for my $test qw(minvalue maxvalue eqvalue nevalue expect nexpect){ +for my $test (qw(minvalue maxvalue eqvalue nevalue expect nexpect)){ my %d = %{ $doc->{fields}{"test::$test"} }; $d{versn} = '3.6'; - for my $sev qw(critical major minor warning){ + for my $sev (qw(critical major minor warning)){ $doc->{fields}{"test::$test.$sev"} = \%d; } } @@ -677,7 +677,11 @@ } if( $k eq 'ovstatus' && $s->{showresult} && $s->{result} && $s->{result_valid} ){ # display most recent result on page - print $fh "$s->{result}\n"; + my $txt = $s->{result}; + $txt =~ s/&/&/g; + $txt =~ s//>/g; + print $fh "$txt\n"; } } @@ -724,8 +728,8 @@ $me->{test}{testedp} = 1 if defined($me->{test}{$p}); } - for my $test qw(minvalue maxvalue eqvalue nevalue expect nexpect){ - for my $sev qw(critical major minor warning){ + for my $test (qw(minvalue maxvalue eqvalue nevalue expect nexpect)){ + for my $sev (qw(critical major minor warning)){ $me->{test}{testedp} = 1 if defined($me->{test}{"$test.$sev"}); } @@ -903,7 +907,7 @@ $me->debug( "$tag TEST result $value" ); # and finally test the value - for my $sev qw(critical major minor warning){ + for my $sev (qw(critical major minor warning)){ if( defined($me->{test}{"expect.$sev"}) ){ my $e = $me->{test}{"expect.$sev"}; diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/src/Web.pm /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/src/Web.pm --- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/src/Web.pm 2008-07-20 18:01:13.000000000 -0400 +++ /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/src/Web.pm 2008-09-14 11:37:55.000000000 -0400 @@ -5,7 +5,7 @@ # Date: 2002-Apr-06 21:30 (EST) # Function: web page stuff # -# $Id: Web.pm,v 1.70 2008/07/20 22:01:13 jaw Exp $ +# $Id: Web.pm,v 1.71 2008/09/14 15:37:55 jaw Exp $ package MonEl; use strict; @@ -397,10 +397,6 @@ } print $fh "\n"; - # print $fh "\n"; - # print $fh $me->web_button('Flush Cache', undef, 'func=flushcache'); - # print $fh "\n"; - print $fh "\n"; print $fh $me->web_button('Check Now', undef, 'func=checknow'); print $fh "\n"; @@ -456,13 +452,6 @@ } print $fh "
\n"; - -# RSN - web based configurator -# print $fh "\n"; -# print $fh $me->web_button('Add Data', undef, 'func=adddata'); -# print $fh $me->web_button('Add Group', undef, 'func=addgrp') if $me->{type} =~ /Group|Host/; -# print $fh $me->web_button('Add Service', undef, 'func=addsrvc') if $me->{type} =~ /Group|Host/; -# print $fh "\n"; print $fh $me->{web}{buttons_bottom_html}, "\n" if $me->{web}{buttons_bottom_html}; diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/src/graphd.pl /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/src/graphd.pl --- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/src/graphd.pl 2008-02-03 23:56:21.000000000 -0500 +++ /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/src/graphd.pl 2008-09-14 11:37:56.000000000 -0400 @@ -6,7 +6,7 @@ # Date: 2002-Oct-31 15:45 (EST) # Function: server side of graph data collector # -# $Id: graphd.pl,v 1.15 2008/02/04 04:56:21 jaw Exp $ +# $Id: graphd.pl,v 1.16 2008/09/14 15:37:56 jaw Exp $ # read in data from argusd, save to data files # uses a large number of file descriptors, be sure @@ -26,6 +26,7 @@ my %obj = (); my @lru = (); my $nopen; +my $DATADIR = $ENV{ARGUS_DATA} || $::datadir; my $syslog = $ENV{ARGUS_SYSLOG}; if( $syslog ){ @@ -236,11 +237,13 @@ my $name = $me->{name}; my $x; my $err; + + my $file = "$DATADIR/gdata/$name"; - if( -f "$::datadir/gdata/$name" ){ - $x = "+< $::datadir/gdata/$name"; + if( -f $file ){ + $x = "+< $file"; }else{ - $x = "+> $::datadir/gdata/$name"; + $x = "+> $file"; $me->{need_init} = 1; } diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/src/main.pl /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/src/main.pl --- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/src/main.pl 2008-02-03 23:56:21.000000000 -0500 +++ /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/src/main.pl 2008-10-25 12:34:54.000000000 -0400 @@ -6,7 +6,7 @@ # Date: 2002-Apr-02 12:09 (EST) # Function: argus startup and glue # -# $Id: main.pl,v 1.69 2008/02/04 04:56:21 jaw Exp $ +# $Id: main.pl,v 1.70 2008/10/25 16:34:54 jaw Exp $ # In God we trust, everyone else we monitor. # -- U2 pilot motto @@ -153,9 +153,9 @@ my $wantclean; foreach my $dir (qw(html gdata stats)){ for my $a ('A'..'Z'){ - mkdir "$datadir/$dir/$a"; + mkdir "$datadir/$dir/$a", 0777; for my $b ('A'..'Z'){ - mkdir "$datadir/$dir/$a/$b"; + mkdir "$datadir/$dir/$a/$b", 0777; } } } diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/src/web_graph.pl /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/src/web_graph.pl --- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080810/src/web_graph.pl 2008-07-28 18:08:11.000000000 -0400 +++ /home/hostedsites/www.jeremykister.com/data/argus/argus-3.6/src/web_graph.pl 2008-10-25 11:31:47.000000000 -0400 @@ -5,7 +5,7 @@ # Created: 2005-Dec-10 12:51 (EST) # Function: cgi graph functions # -# $Id: web_graph.pl,v 1.8 2008/07/20 22:01:14 jaw Exp $ +# $Id: web_graph.pl,v 1.9 2008/10/25 15:31:47 jaw Exp $ package Argus::Web; use Socket; @@ -145,10 +145,11 @@ $which = $me->{q}->param('which'); $back = $me->{q}->url() . "?object=" . encode($obj) . ";func=page"; - $me->startpage( title => "Graph $obj", - bkgimg => decode($r->{bkgimg}), - style => decode($r->{style_sheet}), - icon => decode($r->{icon}) ); + $me->startpage( title => "Graph $obj", + refresh => decode($r->{refresh}), + bkgimg => decode($r->{bkgimg}), + style => decode($r->{style_sheet}), + icon => decode($r->{icon}) ); print decode($r->{header}), "\n"; # $obj