From blair at orcaware.com Thu Jun 5 21:50:28 2003
From: blair at orcaware.com (Blair Zajac)
Date: Thu, 5 Jun 2003 21:50:28 -0700
Subject: [Orca-checkins] rev 237 - in trunk/orca: .
data_gatherers/orca_services data_gatherers/orcallator
data_gatherers/procallator orca
Message-ID: <200306060450.h564oS0g030401@orcaware.com>
Author: blair
Date: Thu Jun 5 21:50:25 2003
New Revision: 237
Modified:
trunk/orca/INSTALL
trunk/orca/data_gatherers/orca_services/orca_services.cfg.in
trunk/orca/data_gatherers/orcallator/orcallator.cfg.in
trunk/orca/data_gatherers/procallator/procallator.cfg
trunk/orca/orca/orca.pl.in
Log:
* INSTALL
(Doing an upgrade from Orca 0.23 or older?):
The upgrade_installation program was misspelled and listed in the
wrong directory.
([Solaris Only and Optional] Install orcallator):
Update the section on configuring orcallator.cfg to the particular
site.
* orca/orca.pl.in
(POD): Correct the description of html_top_title, which is only used
in the main index.html file.
* data_gatherers/orca_services/orca_services.cfg.in,
* data_gatherers/orcallator/orcallator.cfg.in,
* data_gatherers/procallator/procallator.cfg:
Add/or correct the description of the html_page_header,
html_top_title and html_page_footer configuration parameters.
Modified: trunk/orca/INSTALL
==============================================================================
--- trunk/orca/INSTALL (original)
+++ trunk/orca/INSTALL Thu Jun 5 21:50:25 2003
@@ -342,8 +342,8 @@
If you have some new directories that are not included in the
above list directories that make upgrade will cover, you can run
- the src/upgrage_installation program with a list of directories to
- parse and rename. If you want to see what upgrage_installation
+ the orca/upgrade_installation program with a list of directories
+ to parse and rename. If you want to see what upgrade_installation
will rename without actually doing the rename, give it the -n
option before any directory names.
@@ -459,12 +459,19 @@
f) Edit orcallator.cfg.
- You need to edit the installed orcallator.cfg file and remove
- all unneeded references. In particular, you'll want to change
- warn_email, which is the email address that receives emails
- when orcallator generated files are out of date, which may
- signify a orcallator program that has died and is no longer
- gathering data.
+ You will probably want to edit orcallator.cfg to customize
+ various parameters for your site.
+
+ To change the HTML header and footer's on each web page, modify
+ the html_page_header and html_page_footer configuration values.
+ You may also want to edit the html_top_title, which is the
+ title of the top level HTML page.
+
+ You may want to change warn_email, which is the email address
+ that is sent mail when Orca sends out warning messages, such as
+ when the input data files (say generated by orcallator) are out
+ of date, which may signify a orcallator program that has died
+ and is no longer gathering data.
11) Run Orca.
Modified: trunk/orca/data_gatherers/orca_services/orca_services.cfg.in
==============================================================================
--- trunk/orca/data_gatherers/orca_services/orca_services.cfg.in (original)
+++ trunk/orca/data_gatherers/orca_services/orca_services.cfg.in Thu Jun 5 21:50:25 2003
@@ -72,14 +72,14 @@
}
}
-#
-# ATTENTION: change this to your values
-#
+# This sets the text, that should not be HTML markup, that is used
+# only in the main index.html file. It is used in the
+# element and also placed in the HTML body after the html_page_header
+# in a element index.html file.
html_top_title Services Status
-#
-# ATTENTION: change this to your values
-#
+# This sets the HTML markup that is placed at the very top of every
+# web page and is primarily used to display the site's logo.
html_page_header
![kpnQwest Portugal]()
+# This sets the HTML markup that is placed at the bottom of every web
+# page.
html_page_footer
Modified: trunk/orca/data_gatherers/orcallator/orcallator.cfg.in
==============================================================================
--- trunk/orca/data_gatherers/orcallator/orcallator.cfg.in (original)
+++ trunk/orca/data_gatherers/orcallator/orcallator.cfg.in Thu Jun 5 21:50:25 2003
@@ -50,13 +50,13 @@
generate_yearly_plot 1
# This sets the HTML markup that is placed at the very top of every
-# web page and is primarly used to display the site's logo.
+# web page and is primarily used to display the site's logo.
html_page_header Put your site's logo here.
-# This sets the text, that should not be HTML markup, that is placed
-# in each web page's element. This text is also added
-# to each HTML page in a element after the html_page_header
-# HTML markup.
+# This sets the text, that should not be HTML markup, that is used
+# only in the main index.html file. It is used in the
+# element and also placed in the HTML body after the html_page_header
+# in a element index.html file.
html_top_title Orca Host Status
# This sets the HTML markup that is placed at the bottom of every web
Modified: trunk/orca/data_gatherers/procallator/procallator.cfg
==============================================================================
--- trunk/orca/data_gatherers/procallator/procallator.cfg (original)
+++ trunk/orca/data_gatherers/procallator/procallator.cfg Thu Jun 5 21:50:25 2003
@@ -67,12 +67,20 @@
}
}
-html_top_title Estado dos servidores TCO/NBT
-
+# This sets the HTML markup that is placed at the very top of every
+# web page and is primarily used to display the site's logo.
html_page_header
+# This sets the text, that should not be HTML markup, that is used
+# only in the main index.html file. It is used in the
+# element and also placed in the HTML body after the html_page_header
+# in a element index.html file.
+html_top_title Estado dos servidores TCO/NBT
+
+# This sets the HTML markup that is placed at the bottom of every web
+# page.
html_page_footer
Modified: trunk/orca/orca/orca.pl.in
==============================================================================
--- trunk/orca/orca/orca.pl.in (original)
+++ trunk/orca/orca/orca.pl.in Thu Jun 5 21:50:25 2003
@@ -1551,18 +1551,20 @@
=item B I ...
-The I is placed at the top of the main index.html that Orca
-creates. By default, no additional text is placed at the top of the
-main index.html.
+This sets the text, that should not be HTML markup, that is used only
+in the main index.html file. It is used in the
+element and also placed in the HTML body after the html_page_header in
+a element index.html file. By default, no additional text
+is placed at the top of the main index.html.
-=item B I ...
+=item B I ...
-The I is placed at the top of each HTML file that Orca creates.
+The I is placed at the top of each HTML file that Orca creates.
By default, no additional text is placed at the top of each HTML file.
-=item B I ...
+=item B I ...
-The I is placed at the bottom of each HTML file that Orca
+The I is placed at the bottom of each HTML file that Orca
creates. By default, no additional text is placed at the bottom of
each HTML file.
From blair at orcaware.com Thu Jun 12 23:10:41 2003
From: blair at orcaware.com (Blair Zajac)
Date: Thu, 12 Jun 2003 23:10:41 -0700
Subject: [Orca-checkins] rev 238 - in trunk/orca: . packages/Time-HiRes-1.47
packages/Time-HiRes-1.48 packages/Time-HiRes-1.48/t
Message-ID: <200306130610.h5D6Af1p002596@orcaware.com>
Author: blair
Date: Thu Jun 12 23:10:35 2003
New Revision: 238
Added:
trunk/orca/packages/Time-HiRes-1.48/
- copied from rev 237, trunk/orca/packages/Time-HiRes-1.47/
Removed:
trunk/orca/packages/Time-HiRes-1.47/
Modified:
trunk/orca/INSTALL
trunk/orca/configure.in
trunk/orca/packages/Time-HiRes-1.48/Changes
trunk/orca/packages/Time-HiRes-1.48/HiRes.pm
trunk/orca/packages/Time-HiRes-1.48/HiRes.xs
trunk/orca/packages/Time-HiRes-1.48/t/HiRes.t
Log:
Upgrade Time::HiRes from 1.47 to 1.48.
* INSTALL (Determine which Perl modules need compiling and installing):
Update all references to Time::HiRes's version number from 1.47 to
1.48.
* configure.in:
Bump Time::HiRes's version number to 1.48.
* packages/Time-HiRes-1.48:
Renamed from packages/Time-HiRes-1.47. Directory contents updated
from Time-HiRes-1.48.tar.gz.
Modified: trunk/orca/INSTALL
==============================================================================
--- trunk/orca/INSTALL (original)
+++ trunk/orca/INSTALL Thu Jun 12 23:10:35 2003
@@ -176,7 +176,7 @@
Math::IntervalSearch >= 1.05 >= 1.05 1.05
RRDs >= 1.000421 >= 1.0.42 1.0.42
Storable >= 2.07 >= 2.07 2.07
- Time::HiRes Not required by Orca 1.47
+ Time::HiRes Not required by Orca 1.48
All seven of these modules are included with the Orca distribution
in the packages directory. When you configure Orca in step 3),
@@ -277,10 +277,10 @@
Time::HiRes
- http://www.perl.com/CPAN/authors/id/J/JH/JHI/Time-HiRes-1.47.tar.gz
+ http://www.perl.com/CPAN/authors/id/J/JH/JHI/Time-HiRes-1.48.tar.gz
- % gunzip -c Time-HiRes-1.47.tar.gz | tar xvf -
- % cd Time-HiRes-1.47
+ % gunzip -c Time-HiRes-1.48.tar.gz | tar xvf -
+ % cd Time-HiRes-1.48
% perl Makefile.PL
% make
% make test
Modified: trunk/orca/configure.in
==============================================================================
--- trunk/orca/configure.in (original)
+++ trunk/orca/configure.in Thu Jun 12 23:10:35 2003
@@ -41,8 +41,8 @@
RRDTOOL_VER=1.000421
STORABLE_DIR=Storable-2.07
STORABLE_VER=2.07
-TIME_HIRES_DIR=Time-HiRes-1.47
-TIME_HIRES_VER=1.47
+TIME_HIRES_DIR=Time-HiRes-1.48
+TIME_HIRES_VER=1.48
AC_SUBST(COMPRESS_ZLIB_DIR)
AC_SUBST(DATA_DUMPER_DIR)
Modified: trunk/orca/packages/Time-HiRes-1.48/Changes
==============================================================================
--- trunk/orca/packages/Time-HiRes-1.47/Changes (original)
+++ trunk/orca/packages/Time-HiRes-1.48/Changes Thu Jun 12 23:10:35 2003
@@ -1,7 +1,11 @@
Revision history for Perl extension Time::HiRes.
+1.48
+ - workaround for buggy gcc 2.95.3 in openbsd/sparc64
+ (perl change #19592)
+
1.47
- - do not use -lrt in Linux (from March Lehmann)
+ - do not use -lrt in Linux (from March Lehmann, perl change #19449)
- unnecessary (nanosleep is in libc anyway)
- harmful (-lrt slows down execution)
- incompatible (with many distributions' pthreads)
Modified: trunk/orca/packages/Time-HiRes-1.48/HiRes.pm
==============================================================================
--- trunk/orca/packages/Time-HiRes-1.47/HiRes.pm (original)
+++ trunk/orca/packages/Time-HiRes-1.48/HiRes.pm Thu Jun 12 23:10:35 2003
@@ -15,7 +15,7 @@
d_usleep d_ualarm d_gettimeofday d_getitimer d_setitimer
d_nanosleep);
-$VERSION = '1.47';
+$VERSION = '1.48';
$XS_VERSION = $VERSION;
$VERSION = eval $VERSION;
@@ -317,6 +317,17 @@
myNVtime = INT2PTR(double(*)(), SvIV(*svp));
printf("The current time is: %f\n", (*myNVtime)());
+=head1 DIAGNOSTICS
+
+=head2 negative time not invented yet
+
+You tried to use a negative time argument.
+
+=head2 internal error: useconds < 0 (unsigned ... signed ...)
+
+Something went horribly wrong-- the number of microseconds that cannot
+become negative just became negative. Maybe your compiler is broken?
+
=head1 CAVEATS
Notice that the core time() maybe rounding rather than truncating.
Modified: trunk/orca/packages/Time-HiRes-1.48/HiRes.xs
==============================================================================
--- trunk/orca/packages/Time-HiRes-1.47/HiRes.xs (original)
+++ trunk/orca/packages/Time-HiRes-1.48/HiRes.xs Thu Jun 12 23:10:35 2003
@@ -36,9 +36,11 @@
# ifdef IVSIZE
# if IVSIZE == LONGSIZE
# define IVdf "ld"
+# define UVuf "lu"
# else
# if IVSIZE == INTSIZE
# define IVdf "d"
+# define UVuf "u"
# endif
# endif
# else
@@ -683,6 +685,17 @@
UV useconds = (UV)(1E6 * (seconds - (UV)seconds));
if (seconds >= 1.0)
sleep((U32)seconds);
+ if ((IV)useconds < 0) {
+#if defined(__sparc64__) && defined(__GNUC__)
+ /* Sparc64 gcc 2.95.3 (e.g. on NetBSD) has a bug
+ * where (0.5 - (UV)(0.5)) will under certain
+ * circumstances (if the double is cast to UV more
+ * than once?) evaluate to -0.5, instead of 0.5. */
+ useconds = -(IV)useconds;
+#endif
+ if ((IV)useconds < 0)
+ croak("Time::HiRes::sleep(%"NVgf"): internal error: useconds < 0 (unsigned %"UVuf" signed %"IVdf")", seconds, useconds, (IV)useconds);
+ }
usleep(useconds);
} else
croak("Time::HiRes::sleep(%"NVgf"): negative time not invented yet", seconds);
Modified: trunk/orca/packages/Time-HiRes-1.48/t/HiRes.t
==============================================================================
--- trunk/orca/packages/Time-HiRes-1.47/t/HiRes.t (original)
+++ trunk/orca/packages/Time-HiRes-1.48/t/HiRes.t Thu Jun 12 23:10:35 2003
@@ -126,7 +126,6 @@
}
else {
my $r = [gettimeofday()];
- #jTime::HiRes::sleep 0.5;
Time::HiRes::sleep( 0.5 );
my $f = tv_interval $r;
ok 11, $f > 0.4 && $f < 0.9, "slept $f instead of 0.5 secs.";
From blair at orcaware.com Sun Jun 15 12:29:50 2003
From: blair at orcaware.com (Blair Zajac)
Date: Sun, 15 Jun 2003 12:29:50 -0700
Subject: [Orca-checkins] rev 239 - in trunk/orca: . packages/TimeDate-1.14
packages/TimeDate-1.16 packages/TimeDate-1.16/lib/Date
packages/TimeDate-1.16/lib/Date/Language packages/TimeDate-1.16/t
Message-ID: <200306151929.h5FJTom5030158@orcaware.com>
Author: blair
Date: Sun Jun 15 12:29:44 2003
New Revision: 239
Added:
trunk/orca/packages/TimeDate-1.16/
- copied from rev 238, trunk/orca/packages/TimeDate-1.14/
trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Afar.pm
trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Amharic.pm
trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Chinese_GB.pm
trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Finnish.pm
trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Gedeo.pm
trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Oromo.pm
trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Sidama.pm
trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Somali.pm
trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Swedish.pm
trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Tigrinya.pm
trunk/orca/packages/TimeDate-1.16/lib/Date/Language/TigrinyaEritrean.pm
trunk/orca/packages/TimeDate-1.16/lib/Date/Language/TigrinyaEthiopian.pm
Removed:
trunk/orca/packages/TimeDate-1.14/
Modified:
trunk/orca/INSTALL
trunk/orca/configure.in
trunk/orca/packages/TimeDate-1.16/ChangeLog
trunk/orca/packages/TimeDate-1.16/MANIFEST
trunk/orca/packages/TimeDate-1.16/Makefile.PL
trunk/orca/packages/TimeDate-1.16/lib/Date/Format.pm
trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Dutch.pm
trunk/orca/packages/TimeDate-1.16/lib/Date/Parse.pm
trunk/orca/packages/TimeDate-1.16/t/date.t
trunk/orca/packages/TimeDate-1.16/t/format.t
trunk/orca/packages/TimeDate-1.16/t/getdate.t
Log:
Upgrade TimeDate from 1.14 to 1.16. The Date::Parse module and its
version number is unchanged in this upgrade.
* INSTALL (Determine which Perl modules need compiling and installing):
Update all references to TimeDate's package version number from 1.14 to
1.16.
* configure.in:
Bump DATE_PARSE_DIR from TimeDate-1.14 to TimeDate-1.16.
* packages/TimeDate-1.16:
Renamed from packages/TimeDate-1.14. Directory contents updated
from TimeDate-1.16.tar.gz.
Modified: trunk/orca/INSTALL
==============================================================================
--- trunk/orca/INSTALL (original)
+++ trunk/orca/INSTALL Sun Jun 15 12:29:44 2003
@@ -204,10 +204,10 @@
Date::Parse
- http://www.perl.com/CPAN/authors/id/G/GB/GBARR/TimeDate-1.14.tar.gz
+ http://www.perl.com/CPAN/authors/id/G/GB/GBARR/TimeDate-1.16.tar.gz
- % gunzip -c TimeDate-1.14.tar.gz | tar xvf -
- % cd TimeDate-1.14
+ % gunzip -c TimeDate-1.16.tar.gz | tar xvf -
+ % cd TimeDate-1.16
% perl Makefile.PL
% make
% make test
Modified: trunk/orca/configure.in
==============================================================================
--- trunk/orca/configure.in (original)
+++ trunk/orca/configure.in Sun Jun 15 12:29:44 2003
@@ -29,7 +29,7 @@
COMPRESS_ZLIB_VER=1.05
DATA_DUMPER_DIR=Data-Dumper-2.101
DATA_DUMPER_VER=2.101
-DATE_PARSE_DIR=TimeDate-1.14
+DATE_PARSE_DIR=TimeDate-1.16
DATE_PARSE_VER=2.24
DEVEL_DPROF_DIR=DProf-19990108
DEVEL_DPROF_VER=19990108
Modified: trunk/orca/packages/TimeDate-1.16/ChangeLog
==============================================================================
--- trunk/orca/packages/TimeDate-1.14/ChangeLog (original)
+++ trunk/orca/packages/TimeDate-1.16/ChangeLog Sun Jun 15 12:29:44 2003
@@ -1,3 +1,67 @@
+Change 814 on 2003/06/03 by (Graham Barr)
+
+ Date::Parse
+ - Time::Local in 5.8 does not support fractional seconds
+
+Change 813 on 2003/06/02 by (Graham Barr)
+
+ Release 1.15
+
+Change 812 on 2003/06/02 by (Graham Barr)
+
+ Fix comments about Language implementation in Date::Parse
+ (patch from Christian Hammers)
+
+Change 811 on 2003/06/02 by (Graham Barr)
+
+ Fix short name for 'maart' to be 'mrt' as suggested by Frank Maas
+
+Change 810 on 2003/06/02 by (Graham Barr)
+
+ Add %G format for GPS week (patch from Eric Richardson)
+
+Change 809 on 2003/06/02 by (Graham Barr)
+
+ Language updates from Daniel Yacob
+
+Change 808 on 2003/06/02 by (Graham Barr)
+
+ str2time("") should return undef
+
+Change 807 on 2003/06/02 by (Graham Barr)
+
+ Added Swedish and Finnish languages from Matthew Musgrove
+
+Change 778 on 2003/03/03 by (Graham Barr)
+
+ Added Chinese_GB language.
+ Supplied by forehead (I don't even pretend tounderstand it)
+
+Change 777 on 2003/03/03 by (Graham Barr)
+
+ Return fractional seconds when specified in an ISO date
+
+Change 776 on 2003/03/03 by (Graham Barr)
+
+ New languages from Daniel Yacob
+
+Change 775 on 2003/03/03 by (Graham Barr)
+
+ Fix UTC support on ISO dates
+
+Change 774 on 2003/03/03 by (Graham Barr)
+
+ Allow a : in a timezone so the dates specified in RSS can be parsed
+ (eg 2002-11-07T23:31:49-05:00) Patch from Kellan
+
+Change 773 on 2003/03/03 by (Graham Barr)
+
+ Support parsing more formats
+
+Change 754 on 2002/11/03 by (Graham Barr)
+
+ Release 1.14
+
Change 753 on 2002/11/03 by (Graham Barr)
Fix bug parsing 2002-11-02 11pm
Modified: trunk/orca/packages/TimeDate-1.16/MANIFEST
==============================================================================
--- trunk/orca/packages/TimeDate-1.14/MANIFEST (original)
+++ trunk/orca/packages/TimeDate-1.16/MANIFEST Sun Jun 15 12:29:44 2003
@@ -4,17 +4,29 @@
README
lib/Date/Format.pm
lib/Date/Language.pm
+lib/Date/Language/Afar.pm
+lib/Date/Language/Amharic.pm
lib/Date/Language/Austrian.pm
lib/Date/Language/Brazilian.pm
+lib/Date/Language/Chinese_GB.pm
lib/Date/Language/Czech.pm
lib/Date/Language/Danish.pm
lib/Date/Language/Dutch.pm
lib/Date/Language/English.pm
+lib/Date/Language/Finnish.pm
lib/Date/Language/French.pm
+lib/Date/Language/Gedeo.pm
lib/Date/Language/German.pm
lib/Date/Language/Greek.pm
lib/Date/Language/Italian.pm
lib/Date/Language/Norwegian.pm
+lib/Date/Language/Oromo.pm
+lib/Date/Language/Sidama.pm
+lib/Date/Language/Somali.pm
+lib/Date/Language/Swedish.pm
+lib/Date/Language/Tigrinya.pm
+lib/Date/Language/TigrinyaEritrean.pm
+lib/Date/Language/TigrinyaEthiopian.pm
lib/Date/Parse.pm
lib/Time/Zone.pm
t/date.t
Modified: trunk/orca/packages/TimeDate-1.16/Makefile.PL
==============================================================================
--- trunk/orca/packages/TimeDate-1.14/Makefile.PL (original)
+++ trunk/orca/packages/TimeDate-1.16/Makefile.PL Sun Jun 15 12:29:44 2003
@@ -1,10 +1,10 @@
# This -*- perl -*- script makes the Makefile
-# $Id: //depot/TimeDate/Makefile.PL#9 $
+# $Id: //depot/TimeDate/Makefile.PL#11 $
#--- Distribution section ---
$DISTNAME = 'TimeDate';
-$VERSION = "1.14";
+$VERSION = "1.16";
#--- Write the Makefile
Modified: trunk/orca/packages/TimeDate-1.16/lib/Date/Format.pm
==============================================================================
--- trunk/orca/packages/TimeDate-1.14/lib/Date/Format.pm (original)
+++ trunk/orca/packages/TimeDate-1.16/lib/Date/Format.pm Sun Jun 15 12:29:44 2003
@@ -1,4 +1,4 @@
-# Date::Format $Id: //depot/TimeDate/lib/Date/Format.pm#8 $
+# Date::Format $Id: //depot/TimeDate/lib/Date/Format.pm#9 $
#
# Copyright (c) 1995-1999 Graham Barr. All rights reserved. This program is free
# software; you can redistribute it and/or modify it under the same terms
@@ -122,6 +122,7 @@
{
@$me = localtime($time);
}
+ $me->[9] = $time;
_subs($me,$fmt);
}
@@ -263,6 +264,8 @@
sub format_Oy { roman(format_y(@_)) }
sub format_OY { roman(format_Y(@_)) }
+sub format_G { int(($_[0]->[9] - 315993600) / 604800) }
+
1;
__END__
@@ -353,6 +356,7 @@
%d numeric day of the month, with leading zeros (eg 01..31)
%e numeric day of the month, without leading zeros (eg 1..31)
%D MM/DD/YY
+ %G GPS week number (weeks since January 6, 1980)
%h month abbr
%H hour, 24 hour clock, leading 0's)
%I hour, 12 hour clock, leading 0's)
Added: trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Afar.pm
==============================================================================
--- (empty file)
+++ trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Afar.pm Sun Jun 15 12:29:44 2003
@@ -0,0 +1,49 @@
+##
+## Afar tables
+##
+
+package Date::Language::Afar;
+
+use Date::Language ();
+use vars qw(@ISA @DoW @DoWs @MoY @MoYs @AMPM @Dsuf %MoY %DoW $VERSION);
+ at ISA = qw(Date::Language);
+$VERSION = "0.99";
+
+ at DoW = qw(Acaada Etleeni Talaata Arbaqa Kamiisi Gumqata Sabti);
+ at MoY = (
+"Qunxa Garablu",
+"Kudo",
+"Ciggilta Kudo",
+"Agda Baxis",
+"Caxah Alsa",
+"Qasa Dirri",
+"Qado Dirri",
+"Liiqen",
+"Waysu",
+"Diteli",
+"Ximoli",
+"Kaxxa Garablu"
+);
+ at DoWs = map { substr($_,0,3) } @DoW;
+ at MoYs = map { substr($_,0,3) } @MoY;
+ at AMPM = qw(saaku carra);
+
+ at Dsuf = (qw(th st nd rd th th th th th th)) x 3;
+ at Dsuf[11,12,13] = qw(th th th);
+ at Dsuf[30,31] = qw(th st);
+
+ at MoY{@MoY} = (0 .. scalar(@MoY));
+ at MoY{@MoYs} = (0 .. scalar(@MoYs));
+ at DoW{@DoW} = (0 .. scalar(@DoW));
+ at DoW{@DoWs} = (0 .. scalar(@DoWs));
+
+# Formatting routines
+
+sub format_a { $DoWs[$_[0]->[6]] }
+sub format_A { $DoW[$_[0]->[6]] }
+sub format_b { $MoYs[$_[0]->[4]] }
+sub format_B { $MoY[$_[0]->[4]] }
+sub format_h { $MoYs[$_[0]->[4]] }
+sub format_p { $_[0]->[2] >= 12 ? $AMPM[1] : $AMPM[0] }
+
+1;
Added: trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Amharic.pm
==============================================================================
--- (empty file)
+++ trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Amharic.pm Sun Jun 15 12:29:44 2003
@@ -0,0 +1,87 @@
+##
+## Amharic tables
+##
+
+package Date::Language::Amharic;
+
+use Date::Language ();
+use vars qw(@ISA @DoW @DoWs @MoY @MoYs @AMPM @Dsuf %MoY %DoW $VERSION);
+ at ISA = qw(Date::Language);
+$VERSION = "1.00";
+
+if ( $] >= 5.006 ) {
+ at DoW = (
+"\x{12a5}\x{1211}\x{12f5}",
+"\x{1230}\x{129e}",
+"\x{121b}\x{12ad}\x{1230}\x{129e}",
+"\x{1228}\x{1261}\x{12d5}",
+"\x{1210}\x{1219}\x{1235}",
+"\x{12d3}\x{122d}\x{1265}",
+"\x{1245}\x{12f3}\x{121c}"
+);
+ at MoY = (
+"\x{1303}\x{1295}\x{12e9}\x{12c8}\x{122a}",
+"\x{134c}\x{1265}\x{1229}\x{12c8}\x{122a}",
+"\x{121b}\x{122d}\x{127d}",
+"\x{12a4}\x{1355}\x{1228}\x{120d}",
+"\x{121c}\x{12ed}",
+"\x{1301}\x{1295}",
+"\x{1301}\x{120b}\x{12ed}",
+"\x{12a6}\x{1308}\x{1235}\x{1275}",
+"\x{1234}\x{1355}\x{1274}\x{121d}\x{1260}\x{122d}",
+"\x{12a6}\x{12ad}\x{1270}\x{12cd}\x{1260}\x{122d}",
+"\x{1296}\x{126c}\x{121d}\x{1260}\x{122d}",
+"\x{12f2}\x{1234}\x{121d}\x{1260}\x{122d}"
+);
+ at DoWs = map { substr($_,0,3) } @DoW;
+ at MoYs = map { substr($_,0,3) } @MoY;
+ at AMPM = ( "\x{1320}\x{12cb}\x{1275}", "\x{12a8}\x{1230}\x{12d3}\x{1275}" );
+
+ at Dsuf = ("\x{129b}" x 31);
+}
+else {
+ at DoW = (
+"?????????",
+"??????",
+"????????????",
+"?????????",
+"?????????",
+"?????????",
+"?????????"
+);
+ at MoY = (
+"???????????????",
+"???????????????",
+"?????????",
+"????????????",
+"??????",
+"??????",
+"?????????",
+"????????????",
+"??????????????????",
+"??????????????????",
+"???????????????",
+"???????????????"
+);
+ at DoWs = map { substr($_,0,9) } @DoW;
+ at MoYs = map { substr($_,0,9) } @MoY;
+ at AMPM = ( "?????????", "????????????" );
+
+ at Dsuf = ("???" x 31);
+}
+
+ at MoY{@MoY} = (0 .. scalar(@MoY));
+ at MoY{@MoYs} = (0 .. scalar(@MoYs));
+ at DoW{@DoW} = (0 .. scalar(@DoW));
+ at DoW{@DoWs} = (0 .. scalar(@DoWs));
+
+# Formatting routines
+
+sub format_a { $DoWs[$_[0]->[6]] }
+sub format_A { $DoW[$_[0]->[6]] }
+sub format_b { $MoYs[$_[0]->[4]] }
+sub format_B { $MoY[$_[0]->[4]] }
+sub format_h { $MoYs[$_[0]->[4]] }
+sub format_p { $_[0]->[2] >= 12 ? $AMPM[1] : $AMPM[0] }
+
+1;
Added: trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Chinese_GB.pm
==============================================================================
--- (empty file)
+++ trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Chinese_GB.pm Sun Jun 15 12:29:44 2003
@@ -0,0 +1,36 @@
+##
+## English tables
+##
+
+package Date::Language::Chinese_GB;
+
+use Date::Language ();
+use vars qw(@ISA @DoW @DoWs @MoY @MoYs @AMPM @Dsuf %MoY %DoW $VERSION);
+ at ISA = qw(Date::Language);
+$VERSION = "1.01";
+
+ at DoW = qw(?????? ?????? ?????? ?????? ?????? ?????? ??????);
+ at MoY = qw(???? ???? ???? ???? ???? ????
+ ???? ???? ???? ???? ?????? ??????);
+ at DoWs = map { $_ } @DoW;
+ at MoYs = map { $_ } @MoY;
+ at AMPM = qw(???? ????);
+
+ at Dsuf = (qw(?? ?? ?? ?? ?? ?? ?? ?? ?? ??)) x 3;
+
+ at MoY{@MoY} = (0 .. scalar(@MoY));
+ at MoY{@MoYs} = (0 .. scalar(@MoYs));
+ at DoW{@DoW} = (0 .. scalar(@DoW));
+ at DoW{@DoWs} = (0 .. scalar(@DoWs));
+
+# Formatting routines
+
+sub format_a { $DoWs[$_[0]->[6]] }
+sub format_A { $DoW[$_[0]->[6]] }
+sub format_b { $MoYs[$_[0]->[4]] }
+sub format_B { $MoY[$_[0]->[4]] }
+sub format_h { $MoYs[$_[0]->[4]] }
+sub format_p { $_[0]->[2] >= 12 ? $AMPM[1] : $AMPM[0] }
+
+sub format_o { sprintf("%2d%s",$_[0]->[3],"??") }
+1;
Modified: trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Dutch.pm
==============================================================================
--- trunk/orca/packages/TimeDate-1.14/lib/Date/Language/Dutch.pm (original)
+++ trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Dutch.pm Sun Jun 15 12:29:44 2003
@@ -8,11 +8,12 @@
use Date::Language ();
use vars qw(@ISA @DoW @DoWs @MoY @MoYs @AMPM @Dsuf %MoY %DoW $VERSION);
@ISA = qw(Date::Language);
-$VERSION = "1.01";
+$VERSION = "1.02";
@MoY = qw(januari februari maart april mei juni juli
augustus september oktober november december);
@MoYs = map(substr($_, 0, 3), @MoY);
+$MoYs[2] = 'mrt'; # mrt is more common (Frank Maas)
@DoW = map($_ . "dag", qw(zon maan dins woens donder vrij zater));
@DoWs = map(substr($_, 0, 2), @DoW);
Added: trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Finnish.pm
==============================================================================
--- (empty file)
+++ trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Finnish.pm Sun Jun 15 12:29:44 2003
@@ -0,0 +1,45 @@
+##
+## Finnish tables
+## Contributed by Matthew Musgrove
+## Corrected by roke
+##
+
+package Date::Language::Finnish;
+
+use Date::Language ();
+use vars qw(@ISA @DoW @DoWs @MoY @MoYs @AMPM @Dsuf %MoY %DoW $VERSION);
+ at ISA = qw(Date::Language);
+$VERSION = "1.01";
+
+# In Finnish, the names of the months and days are only capitalized at the beginning of sentences.
+ at MoY = map($_ . "kuu", qw(tammi helmi maalis huhti touko kes? hein? elo syys loka marras joulu));
+ at DoW = qw(sunnuntai maanantai tiistai keskiviikko torstai perjantai lauantai);
+
+# it is not customary to use abbreviated names of months or days
+# per Graham's suggestion:
+ at MoYs = @MoY;
+ at DoWs = @DoW;
+
+# the short form of ordinals
+ at Dsuf = ('.') x 31;
+
+# doesn't look like this is normally used...
+ at AMPM = qw(ap ip);
+
+
+ at MoY{@MoY} = (0 .. scalar(@MoY));
+ at MoY{@MoYs} = (0 .. scalar(@MoYs));
+ at DoW{@DoW} = (0 .. scalar(@DoW));
+ at DoW{@DoWs} = (0 .. scalar(@DoWs));
+
+# Formatting routines
+
+sub format_a { $DoWs[$_[0]->[6]] }
+sub format_A { $DoW[$_[0]->[6]] }
+sub format_b { $MoYs[$_[0]->[4]] }
+sub format_B { $MoY[$_[0]->[4]] }
+sub format_h { $MoYs[$_[0]->[4]] }
+sub format_p { $_[0]->[2] >= 12 ? $AMPM[1] : $AMPM[0] }
+sub format_o { sprintf("%2de",$_[0]->[3]) }
+
+1;
\ No newline at end of file
Added: trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Gedeo.pm
==============================================================================
--- (empty file)
+++ trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Gedeo.pm Sun Jun 15 12:29:44 2003
@@ -0,0 +1,51 @@
+##
+## Gedeo tables
+##
+
+package Date::Language::Gedeo;
+
+use Date::Language ();
+use vars qw(@ISA @DoW @DoWs @MoY @MoYs @AMPM @Dsuf %MoY %DoW $VERSION);
+ at ISA = qw(Date::Language);
+$VERSION = "0.99";
+
+ at DoW = qw( Sanbbattaa Sanno Masano Roobe Hamusse Arbe Qiddamme);
+ at MoY = (
+"Oritto",
+"Birre'a",
+"Onkkollessa",
+"Saddasa",
+"Arrasa",
+"Qammo",
+"Ella",
+"Waacibajje",
+"Canissa",
+"Addolessa",
+"Bittitotessa",
+"Hegeya"
+);
+ at DoWs = map { substr($_,0,3) } @DoW;
+$DoWs[0] = "Snb";
+$DoWs[1] = "Sno";
+ at MoYs = map { substr($_,0,3) } @MoY;
+ at AMPM = qw(gorsa warreti-udumma);
+
+ at Dsuf = (qw(th st nd rd th th th th th th)) x 3;
+ at Dsuf[11,12,13] = qw(th th th);
+ at Dsuf[30,31] = qw(th st);
+
+ at MoY{@MoY} = (0 .. scalar(@MoY));
+ at MoY{@MoYs} = (0 .. scalar(@MoYs));
+ at DoW{@DoW} = (0 .. scalar(@DoW));
+ at DoW{@DoWs} = (0 .. scalar(@DoWs));
+
+# Formatting routines
+
+sub format_a { $DoWs[$_[0]->[6]] }
+sub format_A { $DoW[$_[0]->[6]] }
+sub format_b { $MoYs[$_[0]->[4]] }
+sub format_B { $MoY[$_[0]->[4]] }
+sub format_h { $MoYs[$_[0]->[4]] }
+sub format_p { $_[0]->[2] >= 12 ? $AMPM[1] : $AMPM[0] }
+
+1;
Added: trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Oromo.pm
==============================================================================
--- (empty file)
+++ trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Oromo.pm Sun Jun 15 12:29:44 2003
@@ -0,0 +1,37 @@
+##
+## Oromo tables
+##
+
+package Date::Language::Oromo;
+
+use Date::Language ();
+use vars qw(@ISA @DoW @DoWs @MoY @MoYs @AMPM @Dsuf %MoY %DoW $VERSION);
+ at ISA = qw(Date::Language);
+$VERSION = "0.99";
+
+ at DoW = qw(Dilbata Wiixata Qibxata Roobii Kamiisa Jimaata Sanbata);
+ at MoY = qw(Amajjii Guraandhala Bitooteessa Elba Caamsa Waxabajjii
+ Adooleessa Hagayya Fuulbana Onkololeessa Sadaasa Muddee);
+ at DoWs = map { substr($_,0,3) } @DoW;
+ at MoYs = map { substr($_,0,3) } @MoY;
+ at AMPM = qw(WD WB);
+
+ at Dsuf = (qw(th st nd rd th th th th th th)) x 3;
+ at Dsuf[11,12,13] = qw(th th th);
+ at Dsuf[30,31] = qw(th st);
+
+ at MoY{@MoY} = (0 .. scalar(@MoY));
+ at MoY{@MoYs} = (0 .. scalar(@MoYs));
+ at DoW{@DoW} = (0 .. scalar(@DoW));
+ at DoW{@DoWs} = (0 .. scalar(@DoWs));
+
+# Formatting routines
+
+sub format_a { $DoWs[$_[0]->[6]] }
+sub format_A { $DoW[$_[0]->[6]] }
+sub format_b { $MoYs[$_[0]->[4]] }
+sub format_B { $MoY[$_[0]->[4]] }
+sub format_h { $MoYs[$_[0]->[4]] }
+sub format_p { $_[0]->[2] >= 12 ? $AMPM[1] : $AMPM[0] }
+
+1;
Added: trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Sidama.pm
==============================================================================
--- (empty file)
+++ trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Sidama.pm Sun Jun 15 12:29:44 2003
@@ -0,0 +1,37 @@
+##
+## Sidama tables
+##
+
+package Date::Language::Sidama;
+
+use Date::Language ();
+use vars qw(@ISA @DoW @DoWs @MoY @MoYs @AMPM @Dsuf %MoY %DoW $VERSION);
+ at ISA = qw(Date::Language);
+$VERSION = "0.99";
+
+ at DoW = qw(Sambata Sanyo Maakisanyo Roowe Hamuse Arbe Qidaame);
+ at MoY = qw(January February March April May June
+ July August September October November December);
+ at DoWs = map { substr($_,0,3) } @DoW;
+ at MoYs = map { substr($_,0,3) } @MoY;
+ at AMPM = qw(soodo hawwaro);
+
+ at Dsuf = (qw(th st nd rd th th th th th th)) x 3;
+ at Dsuf[11,12,13] = qw(th th th);
+ at Dsuf[30,31] = qw(th st);
+
+ at MoY{@MoY} = (0 .. scalar(@MoY));
+ at MoY{@MoYs} = (0 .. scalar(@MoYs));
+ at DoW{@DoW} = (0 .. scalar(@DoW));
+ at DoW{@DoWs} = (0 .. scalar(@DoWs));
+
+# Formatting routines
+
+sub format_a { $DoWs[$_[0]->[6]] }
+sub format_A { $DoW[$_[0]->[6]] }
+sub format_b { $MoYs[$_[0]->[4]] }
+sub format_B { $MoY[$_[0]->[4]] }
+sub format_h { $MoYs[$_[0]->[4]] }
+sub format_p { $_[0]->[2] >= 12 ? $AMPM[1] : $AMPM[0] }
+
+1;
Added: trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Somali.pm
==============================================================================
--- (empty file)
+++ trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Somali.pm Sun Jun 15 12:29:44 2003
@@ -0,0 +1,62 @@
+##
+## Somali tables
+##
+
+package Date::Language::Somali;
+
+use Date::Language ();
+use vars qw(@ISA @DoW @DoWs @MoY @MoYs @AMPM @Dsuf %MoY %DoW $VERSION);
+ at ISA = qw(Date::Language);
+$VERSION = "0.99";
+
+ at DoW = qw(Axad Isniin Salaaso Arbaco Khamiis Jimco Sabti);
+ at MoY = (
+"Bisha Koobaad",
+"Bisha Labaad",
+"Bisha Saddexaad",
+"Bisha Afraad",
+"Bisha Shanaad",
+"Bisha Lixaad",
+"Bisha Todobaad",
+"Bisha Sideedaad",
+"Bisha Sagaalaad",
+"Bisha Tobnaad",
+"Bisha Kow iyo Tobnaad",
+"Bisha Laba iyo Tobnaad"
+);
+ at DoWs = map { substr($_,0,3) } @DoW;
+ at MoYs = (
+"Kob",
+"Lab",
+"Sad",
+"Afr",
+"Sha",
+"Lix",
+"Tod",
+"Sid",
+"Sag",
+"Tob",
+"KIT",
+"LIT"
+);
+ at AMPM = qw(SN GN);
+
+ at Dsuf = (qw(th st nd rd th th th th th th)) x 3;
+ at Dsuf[11,12,13] = qw(th th th);
+ at Dsuf[30,31] = qw(th st);
+
+ at MoY{@MoY} = (0 .. scalar(@MoY));
+ at MoY{@MoYs} = (0 .. scalar(@MoYs));
+ at DoW{@DoW} = (0 .. scalar(@DoW));
+ at DoW{@DoWs} = (0 .. scalar(@DoWs));
+
+# Formatting routines
+
+sub format_a { $DoWs[$_[0]->[6]] }
+sub format_A { $DoW[$_[0]->[6]] }
+sub format_b { $MoYs[$_[0]->[4]] }
+sub format_B { $MoY[$_[0]->[4]] }
+sub format_h { $MoYs[$_[0]->[4]] }
+sub format_p { $_[0]->[2] >= 12 ? $AMPM[1] : $AMPM[0] }
+
+1;
Added: trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Swedish.pm
==============================================================================
--- (empty file)
+++ trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Swedish.pm Sun Jun 15 12:29:44 2003
@@ -0,0 +1,40 @@
+##
+## Swedish tables
+## Contributed by Matthew Musgrove
+## Corrected by dempa
+##
+
+package Date::Language::Swedish;
+
+use Date::Language ();
+use vars qw(@ISA @DoW @DoWs @MoY @MoYs @AMPM @Dsuf %MoY %DoW $VERSION);
+ at ISA = qw(Date::Language);
+$VERSION = "1.01";
+
+ at MoY = qw(januari februari mars april maj juni juli augusti september oktober november december);
+ at MoYs = map { substr($_,0,3) } @MoY;
+ at DoW = map($_ . "dagen", qw(s?n m?n tis ons tors fre l?r));
+ at DoWs = map { substr($_,0,2) } @DoW;
+
+# the ordinals are not typically used in modern times
+ at Dsuf = ('a' x 2, 'e' x 29);
+
+ at AMPM = @{Date::Language::English::AMPM};
+
+
+ at MoY{@MoY} = (0 .. scalar(@MoY));
+ at MoY{@MoYs} = (0 .. scalar(@MoYs));
+ at DoW{@DoW} = (0 .. scalar(@DoW));
+ at DoW{@DoWs} = (0 .. scalar(@DoWs));
+
+# Formatting routines
+
+sub format_a { $DoWs[$_[0]->[6]] }
+sub format_A { $DoW[$_[0]->[6]] }
+sub format_b { $MoYs[$_[0]->[4]] }
+sub format_B { $MoY[$_[0]->[4]] }
+sub format_h { $MoYs[$_[0]->[4]] }
+sub format_p { $_[0]->[2] >= 12 ? $AMPM[1] : $AMPM[0] }
+sub format_o { sprintf("%2de",$_[0]->[3]) }
+
+1;
\ No newline at end of file
Added: trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Tigrinya.pm
==============================================================================
--- (empty file)
+++ trunk/orca/packages/TimeDate-1.16/lib/Date/Language/Tigrinya.pm Sun Jun 15 12:29:44 2003
@@ -0,0 +1,58 @@
+##
+## Tigrinya tables
+##
+
+package Date::Language::Tigrinya;
+
+use Date::Language ();
+use vars qw(@ISA @DoW @DoWs @MoY @MoYs @AMPM @Dsuf %MoY %DoW $VERSION);
+ at ISA = qw(Date::Language);
+$VERSION = "1.00";
+
+ at DoW = qw(
+"\x{U1230}\x{U1295}\x{U1260}\x{U1275}",
+"\x{U1230}\x{U1291}\x{U12ed}",
+"\x{U1230}\x{U1209}\x{U1235}",
+"\x{U1228}\x{U1261}\x{U12d5}",
+"\x{U1213}\x{U1219}\x{U1235}",
+"\x{U12d3}\x{U122d}\x{U1262}",
+"\x{U1240}\x{U12f3}\x{U121d}"
+);
+ at MoY = qw(
+"\x{U1303}\x{U1295}\x{U12e9}\x{U12c8}\x{U122a}",
+"\x{U134c}\x{U1265}\x{U1229}\x{U12c8}\x{U122a}",
+"\x{U121b}\x{U122d}\x{U127d}",
+"\x{U12a4}\x{U1355}\x{U1228}\x{U120d}",
+"\x{U121c}\x{U12ed}",
+"\x{U1301}\x{U1295}",
+"\x{U1301}\x{U120b}\x{U12ed}",
+"\x{U12a6}\x{U1308}\x{U1235}\x{U1275}",
+"\x{U1234}\x{U1355}\x{U1274}\x{U121d}\x{U1260}\x{U122d}",
+"\x{U12a6}\x{U12ad}\x{U1270}\x{U12cd}\x{U1260}\x{U122d}",
+"\x{U1296}\x{U126c}\x{U121d}\x{U1260}\x{U122d}",
+"\x{U12f2}\x{U1234}\x{U121d}\x{U1260}\x{U122d}"
+);
+ at DoWs = map { substr($_,0,3) } @DoW;
+ at MoYs = map { substr($_,0,3) } @MoY;
+ at AMPM = (
+"\x{1295}/\x{1230}",
+"\x{12F5}/\x{1230}"
+);
+
+ at Dsuf = ("\x{12ed}" x 31);
+
+ at MoY{@MoY} = (0 .. scalar(@MoY));
+ at MoY{@MoYs} = (0 .. scalar(@MoYs));
+ at DoW{@DoW} = (0 .. scalar(@DoW));
+ at DoW{@DoWs} = (0 .. scalar(@DoWs));
+
+# Formatting routines
+
+sub format_a { $DoWs[$_[0]->[6]] }
+sub format_A { $DoW[$_[0]->[6]] }
+sub format_b { $MoYs[$_[0]->[4]] }
+sub format_B { $MoY[$_[0]->[4]] }
+sub format_h { $MoYs[$_[0]->[4]] }
+sub format_p { $_[0]->[2] >= 12 ? $AMPM[1] : $AMPM[0] }
+
+1;
Added: trunk/orca/packages/TimeDate-1.16/lib/Date/Language/TigrinyaEritrean.pm
==============================================================================
--- (empty file)
+++ trunk/orca/packages/TimeDate-1.16/lib/Date/Language/TigrinyaEritrean.pm Sun Jun 15 12:29:44 2003
@@ -0,0 +1,93 @@
+##
+## Tigrinya-Eritrean tables
+##
+
+package Date::Language::TigrinyaEritrean;
+
+use Date::Language ();
+use vars qw(@ISA @DoW @DoWs @MoY @MoYs @AMPM @Dsuf %MoY %DoW $VERSION);
+ at ISA = qw(Date::Language);
+$VERSION = "1.00";
+
+if ( $] >= 5.006 ) {
+ at DoW = (
+"\x{1230}\x{1295}\x{1260}\x{1275}",
+"\x{1230}\x{1291}\x{12ed}",
+"\x{1230}\x{1209}\x{1235}",
+"\x{1228}\x{1261}\x{12d5}",
+"\x{1213}\x{1219}\x{1235}",
+"\x{12d3}\x{122d}\x{1262}",
+"\x{1240}\x{12f3}\x{121d}"
+);
+ at MoY = (
+"\x{1303}\x{1295}\x{12e9}\x{12c8}\x{122a}",
+"\x{134c}\x{1265}\x{1229}\x{12c8}\x{122a}",
+"\x{121b}\x{122d}\x{127d}",
+"\x{12a4}\x{1355}\x{1228}\x{120d}",
+"\x{121c}\x{12ed}",
+"\x{1301}\x{1295}",
+"\x{1301}\x{120b}\x{12ed}",
+"\x{12a6}\x{1308}\x{1235}\x{1275}",
+"\x{1234}\x{1355}\x{1274}\x{121d}\x{1260}\x{122d}",
+"\x{12a6}\x{12ad}\x{1270}\x{12cd}\x{1260}\x{122d}",
+"\x{1296}\x{126c}\x{121d}\x{1260}\x{122d}",
+"\x{12f2}\x{1234}\x{121d}\x{1260}\x{122d}"
+);
+ at DoWs = map { substr($_,0,3) } @DoW;
+ at MoYs = map { substr($_,0,3) } @MoY;
+ at AMPM = (
+"\x{1295}/\x{1230}",
+"\x{12F5}/\x{1230}"
+);
+
+ at Dsuf = ("\x{12ed}" x 31);
+}
+else {
+ at DoW = (
+"????????????",
+"?????????",
+"?????????",
+"?????????",
+"?????????",
+"?????????",
+"?????????"
+);
+ at MoY = (
+"??????",
+"????????????",
+"????????????",
+"????????????",
+"????????????",
+"??????",
+"?????????",
+"?????????",
+"???????????????",
+"????????????",
+"?????????",
+"????????????"
+);
+ at DoWs = map { substr($_,0,9) } @DoW;
+ at MoYs = map { substr($_,0,9) } @MoY;
+ at AMPM = (
+"???/???",
+"???/???"
+);
+
+ at Dsuf = ("???" x 31);
+}
+
+ at MoY{@MoY} = (0 .. scalar(@MoY));
+ at MoY{@MoYs} = (0 .. scalar(@MoYs));
+ at DoW{@DoW} = (0 .. scalar(@DoW));
+ at DoW{@DoWs} = (0 .. scalar(@DoWs));
+
+# Formatting routines
+
+sub format_a { $DoWs[$_[0]->[6]] }
+sub format_A { $DoW[$_[0]->[6]] }
+sub format_b { $MoYs[$_[0]->[4]] }
+sub format_B { $MoY[$_[0]->[4]] }
+sub format_h { $MoYs[$_[0]->[4]] }
+sub format_p { $_[0]->[2] >= 12 ? $AMPM[1] : $AMPM[0] }
+
+1;
Added: trunk/orca/packages/TimeDate-1.16/lib/Date/Language/TigrinyaEthiopian.pm
==============================================================================
--- (empty file)
+++ trunk/orca/packages/TimeDate-1.16/lib/Date/Language/TigrinyaEthiopian.pm Sun Jun 15 12:29:44 2003
@@ -0,0 +1,93 @@
+##
+## Tigrinya-Ethiopian tables
+##
+
+package Date::Language::TigrinyaEthiopian;
+
+use Date::Language ();
+use vars qw(@ISA @DoW @DoWs @MoY @MoYs @AMPM @Dsuf %MoY %DoW $VERSION);
+ at ISA = qw(Date::Language);
+$VERSION = "1.00";
+
+if ( $] >= 5.006 ) {
+ at DoW = (
+"\x{1230}\x{1295}\x{1260}\x{1275}",
+"\x{1230}\x{1291}\x{12ed}",
+"\x{1230}\x{1209}\x{1235}",
+"\x{1228}\x{1261}\x{12d5}",
+"\x{1213}\x{1219}\x{1235}",
+"\x{12d3}\x{122d}\x{1262}",
+"\x{1240}\x{12f3}\x{121d}"
+);
+ at MoY = (
+"\x{1303}\x{1295}\x{12e9}\x{12c8}\x{122a}",
+"\x{134c}\x{1265}\x{1229}\x{12c8}\x{122a}",
+"\x{121b}\x{122d}\x{127d}",
+"\x{12a4}\x{1355}\x{1228}\x{120d}",
+"\x{121c}\x{12ed}",
+"\x{1301}\x{1295}",
+"\x{1301}\x{120b}\x{12ed}",
+"\x{12a6}\x{1308}\x{1235}\x{1275}",
+"\x{1234}\x{1355}\x{1274}\x{121d}\x{1260}\x{122d}",
+"\x{12a6}\x{12ad}\x{1270}\x{12cd}\x{1260}\x{122d}",
+"\x{1296}\x{126c}\x{121d}\x{1260}\x{122d}",
+"\x{12f2}\x{1234}\x{121d}\x{1260}\x{122d}"
+);
+ at DoWs = map { substr($_,0,3) } @DoW;
+ at MoYs = map { substr($_,0,3) } @MoY;
+ at AMPM = (
+"\x{1295}/\x{1230}",
+"\x{12F5}/\x{1230}"
+);
+
+ at Dsuf = ("\x{12ed}" x 31);
+}
+else {
+ at DoW = (
+"????????????",
+"?????????",
+"?????????",
+"?????????",
+"?????????",
+"?????????",
+"?????????"
+);
+ at MoY = (
+"???????????????",
+"???????????????",
+"?????????",
+"????????????",
+"??????",
+"??????",
+"?????????",
+"????????????",
+"??????????????????",
+"??????????????????",
+"???????????????",
+"???????????????"
+);
+ at DoWs = map { substr($_,0,9) } @DoW;
+ at MoYs = map { substr($_,0,9) } @MoY;
+ at AMPM = (
+"???/???",
+"???/???"
+);
+
+ at Dsuf = ("???" x 31);
+}
+
+ at MoY{@MoY} = (0 .. scalar(@MoY));
+ at MoY{@MoYs} = (0 .. scalar(@MoYs));
+ at DoW{@DoW} = (0 .. scalar(@DoW));
+ at DoW{@DoWs} = (0 .. scalar(@DoWs));
+
+# Formatting routines
+
+sub format_a { $DoWs[$_[0]->[6]] }
+sub format_A { $DoW[$_[0]->[6]] }
+sub format_b { $MoYs[$_[0]->[4]] }
+sub format_B { $MoY[$_[0]->[4]] }
+sub format_h { $MoYs[$_[0]->[4]] }
+sub format_p { $_[0]->[2] >= 12 ? $AMPM[1] : $AMPM[0] }
+
+1;
Modified: trunk/orca/packages/TimeDate-1.16/lib/Date/Parse.pm
==============================================================================
--- trunk/orca/packages/TimeDate-1.14/lib/Date/Parse.pm (original)
+++ trunk/orca/packages/TimeDate-1.16/lib/Date/Parse.pm Sun Jun 15 12:29:44 2003
@@ -1,4 +1,4 @@
-# Date::Parse $Id: //depot/TimeDate/lib/Date/Parse.pm#15 $
+# Date::Parse $Id: //depot/TimeDate/lib/Date/Parse.pm#22 $
#
# Copyright (c) 1995 Graham Barr. All rights reserved. This program is free
# software; you can redistribute it and/or modify it under the same terms
@@ -17,7 +17,7 @@
@ISA = qw(Exporter);
@EXPORT = qw(&strtotime &str2time &strptime);
-$VERSION = "2.24";
+$VERSION = "2.27";
my %month = (
january => 0,
@@ -75,7 +75,7 @@
my $dtstr = lc shift;
my $merid = 24;
- my($year,$month,$day,$hh,$mm,$ss,$zone,$dst);
+ my($year,$month,$day,$hh,$mm,$ss,$zone,$dst,$frac);
$zone = tz_offset(shift) if @_;
@@ -85,15 +85,17 @@
# ignore day names
$dtstr =~ s#([\d\w\s])[\.\,]\s#$1 #sog;
+ $dtstr =~ s/,/ /g;
$dtstr =~ s#($daypat)\s*(den\s)?# #o;
# Time: 12:00 or 12:00:00 with optional am/pm
+
+ return unless $dtstr =~ /\S/;
- if ($dtstr =~ s/(?:^|\s)(\d{4})([-:]?)(\d\d?)\2(\d\d?)(?:[Tt ](\d\d?)(?:([-:]?)(\d\d?)(?:\6(\d\d?)(?:[.,]\d+)?)?)?)?\b/ /) {
- ($year,$month,$day,$hh,$mm,$ss) = ($1,$3-1,$4,$5,$7,$8);
+ if ($dtstr =~ s/\s(\d{4})([-:]?)(\d\d?)\2(\d\d?)(?:[Tt ](\d\d?)(?:([-:]?)(\d\d?)(?:\6(\d\d?)(?:[.,](\d+))?)?)?)?(?=\D)/ /) {
+ ($year,$month,$day,$hh,$mm,$ss,$frac) = ($1,$3-1,$4,$5,$7,$8,$9);
}
unless (defined $hh) {
-
if ($dtstr =~ s#[:\s](\d\d?):(\d\d?)(:(\d\d?)(?:\.\d+)?)?\s*(?:([ap])\.?m?\.?)?\s# #o) {
($hh,$mm,$ss) = ($1,$2,$4 || 0);
$merid = $ampm{$5} if $5;
@@ -107,6 +109,11 @@
}
}
+ if (defined $hh and $hh <= 12 and $dtstr =~ s# ([ap])\.?m?\.?\s# #o) {
+ $merid = $ampm{$1};
+ }
+
+
unless (defined $year) {
# Date: 12-June-96 (using - . or /)
@@ -153,7 +160,7 @@
$zone = tz_offset($1);
return unless defined $zone;
}
- elsif ($dtstr =~ s#\s([a-z]{3,4})?([\-\+]?)-?(\d\d?)(\d\d)?(00)?\s# #o) {
+ elsif ($dtstr =~ s#\s([a-z]{3,4})?([\-\+]?)-?(\d\d?):?(\d\d)?(00)?\s# #o) {
my $m = defined($4) ? "$2$4" : 0;
my $h = "$2$3";
$zone = defined($1) ? tz_offset($1) : 0;
@@ -189,6 +196,7 @@
$year -= 1900 if defined $year && $year > 1900;
$zone += 3600 if defined $zone && $dst;
+ $ss += "0.$frac" if $frac;
return ($ss,$mm,$hh,$day,$month,$year,$zone);
}
@@ -230,6 +238,9 @@
$mm ||= 0;
$ss ||= 0;
+ my $frac = $ss - int($ss);
+ $ss = int $ss;
+
$month = $lt[4]
unless(defined $month);
@@ -269,7 +280,7 @@
ne join("",(localtime(-1))[0..5]);
}
- return $result;
+ return $result + $frac;
}
1;
@@ -312,20 +323,11 @@
=head1 MULTI-LANGUAGE SUPPORT
Date::Parse is capable of parsing dates in several languages, these are
-English, French, German and Italian. Changing the language is done via
-a static method call, for example
-
- Date::Parse->language('German');
-
-will cause Date::Parse to attempt to parse any subsequent dates in German.
-
-This is only a first pass, I am considering changing this to be
+English, French, German and Italian.
$lang = Date::Language->new('German');
$lang->str2time("25 Jun 1996 21:09:55 +0100");
-I am open to suggestions on this.
-
=head1 EXAMPLE DATES
Below is a sample list of dates that are known to be parsable with Date::Parse
@@ -342,6 +344,11 @@
1999 10:02:18 "GMT"
16 Nov 94 22:28:20 PST
+=head1 LIMITATION
+
+Date::Parse uses Time::Local internally, so is limited to only parsing dates
+which result in valid values for Time::Local::timelocal
+
=head1 BUGS
When both the month and the date are specified in the date as numbers
@@ -368,5 +375,5 @@
=cut
-# $Id: //depot/TimeDate/lib/Date/Parse.pm#15 $
+# $Id: //depot/TimeDate/lib/Date/Parse.pm#22 $
Modified: trunk/orca/packages/TimeDate-1.16/t/date.t
==============================================================================
--- trunk/orca/packages/TimeDate-1.14/t/date.t (original)
+++ trunk/orca/packages/TimeDate-1.16/t/date.t Sun Jun 15 12:29:44 2003
@@ -130,12 +130,15 @@
@data = split(/\n/, $data);
-print "1..", scalar(@data),"\n";
-$loop = 1;
+print "1..", 1+ at data,"\n";
+
+print defined(str2time("")) ? "not ok 1\n" : "ok 1\n";
+
+$loop = 2;
foreach (@data)
{
- $time = str2time($_);
+ $time = int str2time($_);
if(defined $time)
{
Modified: trunk/orca/packages/TimeDate-1.16/t/format.t
==============================================================================
--- trunk/orca/packages/TimeDate-1.14/t/format.t (original)
+++ trunk/orca/packages/TimeDate-1.16/t/format.t Sun Jun 15 12:29:44 2003
@@ -2,7 +2,7 @@
use Date::Format qw(ctime time2str);
use Date::Language;
-print "1..150\n";
+print "1..152\n";
my $i = 1;
@@ -39,6 +39,7 @@
%d 07
%e 7
%D 09/07/99
+%G 1026
%h Sep
%H 13
%I 01
@@ -179,3 +180,5 @@
%Oq III
%OY MCMXCIX
%Oy XCIX
+316051200 # Mon Jan 7 00:00:00 1980 GMT
+%G 0
Modified: trunk/orca/packages/TimeDate-1.16/t/getdate.t
==============================================================================
--- trunk/orca/packages/TimeDate-1.14/t/getdate.t (original)
+++ trunk/orca/packages/TimeDate-1.16/t/getdate.t Sun Jun 15 12:29:44 2003
@@ -13,12 +13,14 @@
92/01/02 12:01 AM ;694310460
92/01/02 12:01 PM ;694353660
2002-11-02 11pm GMT ;1036278000
+2002-11-02 11 pm GMT ;1036278000
1995-01-24 GMT ;790905600
1995-01-24 BST ;790902000
1995-06-24 GMT ;803952000
1995-06-24 BST ;803948400
1992-1-2 12:01 GMT ;694353660
Wed, 16 Jun 94 07:29:35 CST ;771773375
+Wed,16 Jun 94 07:29:35 CST ;771773375
Wed, 16 Nov 94 07:29:35 CST ;784992575
Mon, 21 Nov 94 07:42:23 CST ;785425343
Mon, 21 Nov 94 04:28:18 CST ;785413698
@@ -129,6 +131,7 @@
Tue, 15 Nov 1994 0:18:38 -0800 ;784887518
Jul 13 1999 1:23P GMT ;931872180
Jul 13 1999 1:23P.M GMT ;931872180
+Jul 13 1999 1:23P.M. GMT ;931872180
2001-02-26T13:44:12-0700 ;983220252
2001-02-26T13:44-0700 ;983220240
2001-02-26T13-0700 ;983217600
@@ -136,6 +139,9 @@
2001-02-26T13-44-0700 ;983220240
2001-02-26T13-0700 ;983217600
07/Nov/2000:16:45:56 +0100 ;973611956
+2002-11-07T23:31:49-05:00 ;1036729909
+2003-02-17T07:45:56Z ;1045467956
+2003-02-17T08:14:07.198189+0000 ;1045469647.198189
!;
require Time::Local;
@@ -177,15 +183,15 @@
$time_expect += $offset;
- if($time==$time_expect) {
+ if(defined($time) and $time==$time_expect) {
print "ok $loop\n";
}
else {
require Date::Format;
print "-"x50,"\nFAIL $loop\n";
printf "%s\nDiff: %d\n", $str, $time - $time_expect;
- printf "Expect: %10d %s",$time_expect,Date::Format::ctime($time_expect);
- printf "Got: %10d %s",$time, Date::Format::ctime($time);
+ printf "Expect: %10f %s",$time_expect,Date::Format::ctime($time_expect);
+ printf "Got: %10f %s",$time, Date::Format::ctime($time);
}
$loop++;
}
From blair at orcaware.com Sun Jun 15 12:38:33 2003
From: blair at orcaware.com (Blair Zajac)
Date: Sun, 15 Jun 2003 12:38:33 -0700
Subject: [Orca-checkins] rev 240 - in trunk/orca: . data_gatherers
data_gatherers/procallator
Message-ID: <200306151938.h5FJcX5W030944@orcaware.com>
Author: blair
Date: Sun Jun 15 12:38:30 2003
New Revision: 240
Added:
trunk/orca/data_gatherers/procallator/Makefile.in
- copied, changed from rev 238, trunk/orca/data_gatherers/orcallator/Makefile.in
trunk/orca/data_gatherers/procallator/S99procallator.sh.in
- copied, changed from rev 238, trunk/orca/data_gatherers/procallator/procallator
trunk/orca/data_gatherers/procallator/procallator.cfg.in
- copied, changed from rev 238, trunk/orca/data_gatherers/procallator/procallator.cfg
Removed:
trunk/orca/data_gatherers/procallator/install.sh
trunk/orca/data_gatherers/procallator/procallator
trunk/orca/data_gatherers/procallator/procallator.cfg
Modified:
trunk/orca/INSTALL
trunk/orca/Makefile.in
trunk/orca/configure.in
trunk/orca/data_gatherers/Makefile.in
trunk/orca/data_gatherers/procallator/README
Log:
Do the first major integration of procallator into the Orca configure
and Makefile system. This commit doesn't take on fixing or upgrading
the procallator script itself, that'll come next.
* INSTALL
([Systems with System Statistics in /proc, i.e. Linux] Install procallator):
New section for installing procallator on a system.
* Makefile.in:
(procallator_run_at_boot): New rule to run
"make procallator_run_at_boot" in data_gatherers/procallator.
* configure.in:
Search for chkconfig so that procallator can be installed into
/etc/rc.d/init.d on Linux systems.
Search for the /proc equivalent directory on the system.
Add a new configure command line option, --enable-librrdtool, which
forces RRDtool to be compiled even if Perl already has RRDtool
installed, and installs librrd.* into Orca's $libdir.
By default, the configure script will build and install all
available data gatherers so that a single Orca installation can be
used for multiple operating systems. Add three new command line
options that disable installing particular data gatherers,
--disable-orcallator, --disable-orca-services and
--disable-procallator.
* data_gatherers/Makefile.in:
(procallator_run_at_boot): New rule to run
"make procallator_run_at_boot" in data_gatherers/procallator.
Set $(SUBDIRS) to the subdirectories specified by configure.in.
* data_gatherers/procallator/install.sh:
Removed. Functionality replaced by Makefile.in.
* data_gatherers/procallator/Makefile.in:
Copied from data_gatherers/orcallator/Makefile.in.
s/orcallator/procallator/g.
Use chkconfig to set up the links from
/etc/rc.d/init.d/S99procallator into /etc/rc.d/rcX.d/.
* data_gatherers/procallator/README:
Clean up formatting.
Remove installation section, since it is now provided by configure
and Makefile.
Still needs some more work.
* data_gatherers/procallator/S99procallator.sh.in:
Renamed from procallator.
Update to look more like standard /etc/rc.d/init.d scripts.
Do not use hardwired paths to procallator; use paths supplied by
configure.
(start):
Create /var/lock/subsys/procallator and /var/run/procallator.pid.
(stop)
Remove /var/lock/subsys/procallator and /var/run/procallator.pid.
Use killproc() instead of grep to find procallator processes.
(status):
New subcommand.
(restart):
New subcommand.
* data_gatherers/procallator/procallator.cfg.in:
Require Orca version 0.265 or greater.
Replace hardwired paths for base_dir and html_dir with the paths
specified by configure.
Turn expire_images on.
Replace guilherme.chehab at tco.net.br's address for warn_email with
WARN_EMAIL. I'm sure he'll appreciate this :)
Add the generate_*_plot parameters to generate all but the hourly
plots.
Use the html_page_header, html_top_title and html_page_footer from
orcallator.cfg.in.
Rename the group orcallator to group procallator.
Remove the reopen option from the group procallator. This should
speed up processing of input data files.
For the Average # Processes in Run Queue plot, increase data_max
from 100 to 1000 and remove the color for the plots.
For the Interface Input Bits Per Second and the Interface Output
Bits Per Second plots, increase data_max to handle Gigabit
devices.
Make the TCP Current Connections plot use area instead of a line.
Move the "Page Ins & Outs rate" and "Swap Ins & Outs rate" into the
memory section of plots.
Fix some y_legend names to be consistent, specifically change "rate"
to "Counts/s", and use consistent capitalization.
Change colors for some plots.
Modified: trunk/orca/INSTALL
==============================================================================
--- trunk/orca/INSTALL (original)
+++ trunk/orca/INSTALL Sun Jun 15 12:38:30 2003
@@ -29,8 +29,9 @@
e) Run start_orcallator on all systems.
f) Edit orcallator.cfg.
-11) Run Orca.
+11) [Systems with System Statistics in /proc, i.e. Linux] Install procallator.
+12) Run Orca.
@@ -473,7 +474,45 @@
of date, which may signify a orcallator program that has died
and is no longer gathering data.
-11) Run Orca.
+11) [Systems with System Statistics in /proc, i.e. Linux] Install procallator.
+ a) Install procallator boot and halt time start/stop scripts in
+ /etc/init.d/ and /etc/rc?.d/.
+
+ If you want to have procallator run when the machine boots, you
+ can manually copy data_gatherers/procallator/S99procallator
+ into /etc/init.d/procallator and set up symbolic links from
+ that file to the appropriate K* and S* files in /etc/rc?.d/.
+
+ To make installing this easier, you can run
+
+ % make procallator_run_at_boot
+
+ from either the top of the Orca source tree or from the
+ data_gatherers/procallator directory. This uses Linux's
+ chkconfig's script to install the start and stop scripts in the
+ approprirate locations. By default, procallator is started in
+ run levels 2, 3, 4 and 5.
+
+ b) Run start_procallator on all systems.
+
+ Log in as root on all the systems you want to watch and run:
+
+ % /etc/rc.d/init.d/procallator start
+
+ Procallator will not generate an output data file until the
+ first update interval, which will be between 2.5 to 7.5 minutes
+ after procallator is started.
+
+ c) Edit procallator.cfg.
+
+ You need to edit the installed procallator.cfg file and remove
+ all unneeded references. In particular, you'll want to change
+ warn_email, which is the email address that receives emails
+ when procallator generated files are out of date, which may
+ signify a procallator program that has died and is no longer
+ gathering data.
+
+12) Run Orca.
Log into the system that will run Orca and run the command:
Modified: trunk/orca/Makefile.in
==============================================================================
--- trunk/orca/Makefile.in (original)
+++ trunk/orca/Makefile.in Sun Jun 15 12:38:30 2003
@@ -53,6 +53,9 @@
orca_services_run_at_boot:
cd data_gatherers/orca_services && $(MAKE) orca_services_run_at_boot
+procallator_run_at_boot:
+ cd data_gatherers/procallator && $(MAKE) procallator_run_at_boot
+
test_modules:
cd packages && $(MAKE) CFLAGS="$(CFLAGS)" test_modules
Modified: trunk/orca/configure.in
==============================================================================
--- trunk/orca/configure.in (original)
+++ trunk/orca/configure.in Sun Jun 15 12:38:30 2003
@@ -200,6 +200,68 @@
)
AC_SUBST(WARN_EMAIL)
+BUILD_RRD=no
+AC_ARG_ENABLE(librrdtool,
+ AC_HELP_STRING([--enable-librrdtool],
+ [Build RRD and install librrdtool{.a,.so} into $libdir]),
+ [
+ if test "$enableval" = yes; then
+ BUILD_RRD=yes
+ MAKE_RRDTOOL=make_rrdtool
+ TEST_RRDTOOL=test_rrdtool
+ CLEAN_RRDTOOL=clean_rrdtool
+ DISTCLEAN_RRDTOOL=distclean_rrdtool
+ INSTALL_LIB_RRDTOOL=install_lib_rrdtool
+ fi
+ ]
+)
+AC_SUBST(INSTALL_LIB_RRDTOOL)
+
+BUILD_ORCALLATOR=yes
+ORCALLATOR_SUBDIR=orcallator
+AC_ARG_ENABLE(orcallator,
+ AC_HELP_STRING([--disable-orcallator],
+ [Do not enable building and installing orcallator]),
+ [
+ if test "$enableval" = no; then
+ BUILD_ORCALLATOR=no
+ ORCALLATOR_SUBDIR=
+ fi
+ ]
+)
+AC_SUBST(BUILD_ORCALLATOR)
+AC_SUBST(ORCALLATOR_SUBDIR)
+
+BUILD_ORCA_SERVICES=yes
+ORCA_SERVICES_SUBDIR=orca_services
+AC_ARG_ENABLE(orca-services,
+ AC_HELP_STRING([--disable-orca-services],
+ [Do not enable building and installing Orca-Services]),
+ [
+ if test "$enableval" = no; then
+ BUILD_ORCA_SERVICES=no
+ ORCA_SERVICES_SUBDIR=
+ fi
+ ]
+)
+AC_SUBST(BUILD_ORCA_SERVICES)
+AC_SUBST(ORCA_SERVICES_SUBDIR)
+
+BUILD_PROCALLATOR=yes
+PROCALLATOR_SUBDIR=procallator
+AC_ARG_ENABLE(procallator,
+ AC_HELP_STRING([--disable-procallator],
+ [Do not enable building and installing procallator]),
+ [
+ if test "$enableval" = no; then
+ BUILD_PROCALLATOR=no
+ PROCALLATOR_SUBDIR=
+ fi
+ ]
+)
+AC_SUBST(BUILD_PROCALLATOR)
+AC_SUBST(PROCALLATOR_SUBDIR)
+
# To get a default CFLAGS for this build, check for a C compiler. This
# is also needed to be ready to compile any Perl modules.
AC_PROG_CC
@@ -208,6 +270,7 @@
AC_ARG_PROGRAM
AC_PATH_PROG(BZIP2, bzip2)
AC_PATH_PROG(BUNZIP2, bunzip2)
+AC_PATH_PROG(CHKCONFIG, chkconfig)
AC_PATH_PROG(COMPRESS, compress)
AC_PATH_PROG(CUT, cut, cut)
AC_PATH_PROG(EXPR, expr, expr)
@@ -276,27 +339,6 @@
AC_SUBST(COMPRESSOR)
AC_SUBST(UNCOMPRESSOR_PIPE)
-# Always build the orcallator files regardless of the operating system.
-BUILD_ORCALLATOR=yes
-ORCALLATOR_SUBDIR=data_gatherers/orcallator
-INSTALL_LIB_RRDTOOL=
-AC_SUBST(ORCALLATOR_SUBDIR)
-AC_SUBST(INSTALL_LIB_RRDTOOL)
-
-# These commands can be used if the orcallator should not be built.
-# AC_MSG_CHECKING([for solaris host for orcallator install])
-# AC_MSG_RESULT($BUILD_ORCALLATOR)
-# BUILD_ORCALLATOR=no
-# ORCALLATOR_SUBDIR=
-
-# These commands can be used to force a build of the librrdtool library.
-# INSTALL_LIB_RRDTOOL=install_lib_rrdtool
-# MAKE_RRDTOOL=make_rrdtool
-# TEST_RRDTOOL=test_rrdtool
-# INSTALL_PERL_RRDTOOL=
-# CLEAN_RRDTOOL=clean_rrdtool
-# DISTCLEAN_RRDTOOL=distclean_rrdtool
-
# This command can be used to add --enable-shared to the configure
# options for RRDtool if it is not already declared.
# expr "$ORCA_CONFIGURE_COMMAND_LINE" : "--enable-shared" >/dev/null 2>&1 || ORCA_CONFIGURE_COMMAND_LINE="$ORCA_CONFIGURE_COMMAND_LINE --enable-shared"
@@ -394,6 +436,9 @@
BORP_PERL_MODULE(orca_cv_perl_rrds, $PERL, RRDs, $RRDTOOL_VER)
test "$ALWAYS_BUILD_PERL_MODULES" && orca_cv_perl_rrds=no
if test "$orca_cv_perl_rrds" = no; then
+ BUILD_RRD=yes
+fi
+if test "$BUILD_RRD" = yes; then
MAKE_RRDTOOL=make_rrdtool
TEST_RRDTOOL=test_rrdtool
INSTALL_PERL_RRDTOOL=install_perl_rrdtool
@@ -447,6 +492,22 @@
AC_SUBST(INSTALL)
AC_SUBST(MKDIR)
+# Look for the /proc equivalent directory for use by procallator.
+AC_MSG_CHECKING([for /proc style directory])
+PROC_DIR=
+for d in /proc; do
+ if test -d $d; then
+ PROC_DIR="$d"
+ break
+ fi
+done
+if test "$PROC_DIR"; then
+ AC_MSG_RESULT($PROC_DIR)
+else
+ AC_MSG_RESULT(no /proc directory found)
+fi
+AC_SUBST(PROC_DIR)
+
# Determine the appropriate init.d directory on the system.
AC_MSG_CHECKING([where the boot init.d directory is])
for dir in /etc/rc.d/init.d /etc/init.d; do
@@ -478,7 +539,7 @@
AC_SUBST(RCX_D_CONTAINING_DIR)
# Build the RRDtool library if it is needed.
-if test "$orca_cv_perl_rrds" = no; then
+if test "$BUILD_RRD" = yes; then
command="(cd packages/$RRDTOOL_DIR; ./configure $RRD_CONFIGURE_COMMAND_LINE)"
echo ""
echo "Running configure in packages/$RRDTOOL_DIR to create RRDtool and RRDs.pm."
@@ -494,7 +555,7 @@
# variable substitutions.
#--------------------------------------------------------------------
if test "$BUILD_ORCALLATOR" = yes; then
- ORCALLATOR_OUTPUT="data_gatherers/orcallator/Makefile
+ OUTPUT_ORCALLATOR="data_gatherers/orcallator/Makefile
data_gatherers/orcallator/orcallator.cfg
data_gatherers/orcallator/orcallator_running.pl
data_gatherers/orcallator/restart_orcallator.sh
@@ -503,6 +564,24 @@
data_gatherers/orcallator/S99orcallator.sh"
fi
+if test "$BUILD_ORCA_SERVICES" = yes; then
+ OUTPUT_ORCA_SERVICES="data_gatherers/orca_services/Makefile
+ data_gatherers/orca_services/orca_services.cfg
+ data_gatherers/orca_services/orca_services.pl
+ data_gatherers/orca_services/orca_services_running.pl
+ data_gatherers/orca_services/restart_orca_services.sh
+ data_gatherers/orca_services/start_orca_services.sh
+ data_gatherers/orca_services/stop_orca_services.sh
+ data_gatherers/orca_services/S99orca_services.sh"
+fi
+
+if test "$BUILD_PROCALLATOR" = yes; then
+ OUTPUT_PROCALLATOR="data_gatherers/procallator/Makefile
+ data_gatherers/procallator/procallator.cfg
+ data_gatherers/procallator/procallator.pl
+ data_gatherers/procallator/S99procallator.sh"
+fi
+
AC_OUTPUT(Makefile
config/PerlHead1
config/PerlHead2
@@ -510,15 +589,9 @@
contrib/rotate_orca_graphs/Makefile
contrib/rotate_orca_graphs/rotate_orca_graphs.sh
data_gatherers/Makefile
- $ORCALLATOR_OUTPUT
- data_gatherers/orca_services/Makefile
- data_gatherers/orca_services/orca_services.cfg
- data_gatherers/orca_services/orca_services.pl
- data_gatherers/orca_services/orca_services_running.pl
- data_gatherers/orca_services/restart_orca_services.sh
- data_gatherers/orca_services/start_orca_services.sh
- data_gatherers/orca_services/stop_orca_services.sh
- data_gatherers/orca_services/S99orca_services.sh
+ $OUTPUT_ORCALLATOR
+ $OUTPUT_ORCA_SERVICES
+ $OUTPUT_PROCALLATOR
docs/Makefile
lib/Makefile
packages/Makefile
@@ -546,12 +619,6 @@
echo "Blair Zajac "
echo "----------------------------------------------------------------"
-case "$target" in
- *-solaris*)
- if test -z "$WEB_LOG"; then
- AC_MSG_WARN([*** Unless you use a --with-*-log option orcallator will not gather WWW log data.])
- fi
- ;;
- *)
- ;;
-esac
+if test -z "$WEB_LOG"; then
+ AC_MSG_WARN([*** Unless you use a --with-*-log option orcallator will not gather WWW log data.])
+fi
Modified: trunk/orca/data_gatherers/Makefile.in
==============================================================================
--- trunk/orca/data_gatherers/Makefile.in (original)
+++ trunk/orca/data_gatherers/Makefile.in Sun Jun 15 12:38:30 2003
@@ -1,7 +1,12 @@
@SET_MAKE@
-SUBDIRS = orcallator \
- orca_services
+ORCALLATOR_SUBDIR = @ORCALLATOR_SUBDIR@
+ORCA_SERVICES_SUBDIR = @ORCA_SERVICES_SUBDIR@
+PROCALLATOR_SUBDIR = @PROCALLATOR_SUBDIR@
+
+SUBDIRS = $(ORCALLATOR_SUBDIR) \
+ $(ORCA_SERVICES_SUBDIR) \
+ $(PROCALLATOR_SUBDIR)
all: Makefile $(TARGETS)
@for dir in $(SUBDIRS); do \
@@ -15,6 +20,9 @@
orca_services_run_at_boot:
cd orca_services && $(MAKE) orca_services_run_at_boot
+procallator_run_at_boot:
+ cd procallator && $(MAKE) procallator_run_at_boot
+
install:
@for dir in $(SUBDIRS); do \
echo "cd $$dir && $(MAKE) CFLAGS=$(CFLAGS) install"; \
Copied: trunk/orca/data_gatherers/procallator/Makefile.in (from rev 238, trunk/orca/data_gatherers/orcallator/Makefile.in)
==============================================================================
--- trunk/orca/data_gatherers/orcallator/Makefile.in (original)
+++ trunk/orca/data_gatherers/procallator/Makefile.in Sun Jun 15 12:38:30 2003
@@ -13,22 +13,20 @@
RRD_DIR = @RRD_DIR@
INIT_D_DIR = @INIT_D_DIR@
RCX_D_CONTAINING_DIR = @RCX_D_CONTAINING_DIR@
-RAW_ORCALLATOR_DIR = $(VAR_DIR)/orcallator
-RRD_ORCALLATOR_DIR = $(RRD_DIR)/orcallator
+RAW_PROCALLATOR_DIR = $(VAR_DIR)/procallator
+RRD_PROCALLATOR_DIR = $(RRD_DIR)/procallator
+CHKCONFIG = @CHKCONFIG@
-BIN_PERL_SCRIPTS = orcallator_column \
- orcallator_running
+BIN_PERL_SCRIPTS = procallator
LIBEXEC_PERL_SCRIPTS =
NOINST_PERL_SCRIPTS =
PERL_SCRIPTS = $(BIN_PERL_SCRIPTS) \
$(LIBEXEC_PERL_SCRIPTS) \
$(NOINST_PERL_SCRIPTS)
-BIN_SHELL_SCRIPTS = restart_orcallator \
- stop_orcallator \
- start_orcallator
+BIN_SHELL_SCRIPTS =
LIBEXEC_SHELL_SCRIPTS =
-NOINST_SHELL_SCRIPTS = S99orcallator
+NOINST_SHELL_SCRIPTS = S99procallator
SHELL_SCRIPTS = $(BIN_SHELL_SCRIPTS) \
$(LIBEXEC_SHELL_SCRIPTS) \
$(NOINST_SHELL_SCRIPTS)
@@ -40,47 +38,36 @@
LIBEXEC_TARGETS = $(LIBEXEC_PERL_SCRIPTS) \
$(LIBEXEC_SHELL_SCRIPTS)
-all: Makefile $(TARGETS) orcallator.cfg
+all: Makefile $(TARGETS) procallator.cfg
install: all
$(MKDIR) $(bindir)
- $(MKDIR) $(libdir)
- $(MKDIR) $(sysconfdir)
- $(MKDIR) $(RAW_ORCALLATOR_DIR)
- $(MKDIR) $(RRD_ORCALLATOR_DIR)
+ $(MKDIR) $(RAW_PROCALLATOR_DIR)
+ $(MKDIR) $(RRD_PROCALLATOR_DIR)
@for file in $(BIN_TARGETS); do \
echo $(INSTALL) $$file $(bindir); \
$(INSTALL) $$file $(bindir); \
done
- $(INSTALL) -m 0644 orcallator.se $(libdir)
- @if test -r $(sysconfdir)/orcallator.cfg; then \
+ @if test -r $(sysconfdir)/procallator.cfg; then \
date="`date +%Y-%m-%d-%H:%M:%S`"; \
- echo $(INSTALL) -m 0644 orcallator.cfg $(sysconfdir)/orcallator.cfg.$$date; \
- $(INSTALL) -m 0644 orcallator.cfg $(sysconfdir)/orcallator.cfg.$$date; \
+ echo $(INSTALL) -m 0644 procallator.cfg $(sysconfdir)/procallator.cfg.$$date; \
+ $(INSTALL) -m 0644 procallator.cfg $(sysconfdir)/procallator.cfg.$$date; \
else \
- echo $(INSTALL) -m 0644 orcallator.cfg $(sysconfdir); \
- $(INSTALL) -m 0644 orcallator.cfg $(sysconfdir); \
+ echo $(INSTALL) -m 0644 procallator.cfg $(sysconfdir); \
+ $(INSTALL) -m 0644 procallator.cfg $(sysconfdir); \
fi
-orcallator_run_at_boot: all
+procallator_run_at_boot: all
test "$(INIT_D_DIR)"
- test "$(RCX_D_CONTAINING_DIR)"
- -$(RM) $(INIT_D_DIR)/orcallator
- -$(RM) $(RCX_D_CONTAINING_DIR)/rc0.d/K01orcallator
- -$(RM) $(RCX_D_CONTAINING_DIR)/rc1.d/K01orcallator
- -$(RM) $(RCX_D_CONTAINING_DIR)/rc2.d/K01orcallator
- -$(RM) $(RCX_D_CONTAINING_DIR)/rc3.d/S99orcallator
- $(INSTALL) -m 0744 S99orcallator $(INIT_D_DIR)/orcallator
- ln -s $(INIT_D_DIR)/orcallator $(RCX_D_CONTAINING_DIR)/rc0.d/K01orcallator
- ln -s $(INIT_D_DIR)/orcallator $(RCX_D_CONTAINING_DIR)/rc1.d/K01orcallator
- ln -s $(INIT_D_DIR)/orcallator $(RCX_D_CONTAINING_DIR)/rc2.d/K01orcallator
- ln -s $(INIT_D_DIR)/orcallator $(RCX_D_CONTAINING_DIR)/rc3.d/S99orcallator
+ -$(RM) $(INIT_D_DIR)/procallator
+ $(INSTALL) -m 0744 S99procallator $(INIT_D_DIR)/procallator
+ $(CHKCONFIG) --add procallator
clean:
$(RM) $(TARGETS)
distclean: clean
- $(RM) *.sh orcallator.cfg orcallator_running.pl Makefile
+ $(RM) *.sh procallator.pl Makefile
.SUFFIXES: .pl .sh
@@ -93,22 +80,13 @@
chmod 0755 $@
Makefile: Makefile.in
- cd ../.. && CONFIG_FILES=data_gatherers/orcallator/Makefile ./config.status
+ cd ../.. && CONFIG_FILES=data_gatherers/procallator/Makefile ./config.status
-orcallator.cfg: orcallator.cfg.in
- cd ../.. && CONFIG_FILES=data_gatherers/orcallator/orcallator.cfg ./config.status
+procallator.cfg: procallator.cfg.in
+ cd ../.. && CONFIG_FILES=data_gatherers/procallator/procallator.cfg ./config.status
-orcallator_running.pl: orcallator_running.pl.in
- cd ../.. && CONFIG_FILES=data_gatherers/orcallator/orcallator_running.pl ./config.status
+procallator.pl: procallator.pl.in
+ cd ../.. && CONFIG_FILES=data_gatherers/procallator/procallator.pl ./config.status
-restart_orcallator.sh: restart_orcallator.sh.in
- cd ../.. && CONFIG_FILES=data_gatherers/orcallator/restart_orcallator.sh ./config.status
-
-start_orcallator.sh: start_orcallator.sh.in
- cd ../.. && CONFIG_FILES=data_gatherers/orcallator/start_orcallator.sh ./config.status
-
-stop_orcallator.sh: stop_orcallator.sh.in
- cd ../.. && CONFIG_FILES=data_gatherers/orcallator/stop_orcallator.sh ./config.status
-
-S99orcallator.sh: S99orcallator.sh.in
- cd ../.. && CONFIG_FILES=data_gatherers/orcallator/S99orcallator.sh ./config.status
+S99procallator.sh: S99procallator.sh.in
+ cd ../.. && CONFIG_FILES=data_gatherers/procallator/S99procallator.sh ./config.status
Modified: trunk/orca/data_gatherers/procallator/README
==============================================================================
--- trunk/orca/data_gatherers/procallator/README (original)
+++ trunk/orca/data_gatherers/procallator/README Sun Jun 15 12:38:30 2003
@@ -1,23 +1,21 @@
-Linux ORCA-aware statistics colector
+Linux Orca-aware statistics collector.
-This piece of software is for use with Orca, by Blair Zajac - http://www.gps.caltech.edu/~blair/orca/ - and intends
-to provide relevant system statistics in a friendly and graphical interface.
+This piece of software is for use with Orca, by Blair Zajac
+ http://www.orcaware.com/orca/
+and intends to provide relevant system statistics in a friendly and
+graphical interface.
- Requirements:
- - A running Orca server.
- - perl 5 installad on target linux systems
- - a mecanism for remote distribution of software to send collected stats from de target to the server.
- I use rsync, but anything, ranging from ftp to NFS will do fine.
- Check the updat_orca_server.sh script (I use it in crontab) for reference on doing it
+ Requirements:
+ - A running Orca server.
+ - Perl 5 installed on target Linux systems.
+ - a mechanism for remote distribution of software to send
+ collected stats from the target to the server.
- Installation:
- The installation is quite simple.
- - Edit script procallator.pl and adjust the configurable parameters on the beginning of this file
- - Edit install.sh script and check it
- - as root run install.sh
- - configure the distribution mecanism
- - on the server, run orca using the exmple procallator.cfg
+ I use rsync, but anything, ranging from ftp to NFS will do fine.
-This software is in alpha stage, use at your own risk.
+ Check the update_orca_server.sh script (I use it in
+ crontab) for reference on doing it.
+
+This software is in alpha stage, so use at your own risk.
Any comments to Guilherme Chehab
Copyright (C) 2001 Guilherme Carvalho Chehab. All Rights Reserved
Copied: trunk/orca/data_gatherers/procallator/S99procallator.sh.in (from rev 238, trunk/orca/data_gatherers/procallator/procallator)
==============================================================================
--- trunk/orca/data_gatherers/procallator/procallator (original)
+++ trunk/orca/data_gatherers/procallator/S99procallator.sh.in Sun Jun 15 12:38:30 2003
@@ -1,31 +1,77 @@
#!/bin/sh
#
-# procallator Script to load procallator at time.
+# Startup script for the procallator data measurement tool
#
-# Author Guilherme Carvalho Chehab
+# chkconfig: 2345 99 01
#
+# description: Procallator is a data measurement tool that measures
+# many system statistics.
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+procallator=$bindir/procallator
+
+RETVAL=0
# Source function library.
. /etc/init.d/functions
+start ()
+{
+ echo -n $"Starting procallator: "
+ if [ -x $procallator ]; then
+ $procallator &
+ RETVAL=$?
+ PID=$!
+ if test $RETVAL -eq 0; then
+ success $"procallator startup"
+ touch /var/lock/subsys/procallator
+ echo $PID > /var/run/procallator.pid
+ else
+ failure $"procallator startup"
+ fi
+ echo
+ else
+ failure "$0: $procallator does not exist or is not executable."
+ fi
+}
+
+stop ()
+{
+ echo -n $"Stopping procallator: "
+ killproc $procallator
+ RETVAL=$?
+ echo
+ if test $RETVAL -eq 0; then
+ rm -f /var/lock/subsys/procallator /var/run/procallator.pid
+ fi
+}
+
# See how we were called.
case "$1" in
- start)
- if [ -f /usr/local/bin/procallator.pl ]; then
- action "Initializing procalator statistics colector " /usr/local/bin/procallator.pl &
- fi
-
- ;;
- stop)
- action "Stoping procallator" kill `ps -ef | grep procallat | grep -v grep | tr -s " " | cut -f 2 -d " "`
-
- ;;
- *)
- # do not advertise unreasonable commands that there is no reason
- # to use with this device
- echo "Usage: procallator {start|stop}"
- exit 1
-esac
-exit 0
+start)
+ start
+ ;;
+stop)
+ stop
+ ;;
+
+status)
+ status procallator
+ ;;
+
+restart)
+ stop
+ start
+ ;;
+
+*)
+ echo "Usage: $0 {start|stop|restart|status}"
+ exit 1
+ ;;
+
+esac
+exit $RETVAL
Copied: trunk/orca/data_gatherers/procallator/procallator.cfg.in (from rev 238, trunk/orca/data_gatherers/procallator/procallator.cfg)
==============================================================================
--- trunk/orca/data_gatherers/procallator/procallator.cfg (original)
+++ trunk/orca/data_gatherers/procallator/procallator.cfg.in Sun Jun 15 12:38:30 2003
@@ -1,27 +1,34 @@
# Orca configuration file for procallator files.
+# Require at least this version of Orca.
+require Orca 0.265
+
# base_dir is prepended to the paths find_files, html_dir, rrd_dir,
# and state_file only if the path does not match the regular
# expression ^\\?\.{0,2}/, which matches /, ./, ../, and \./.
-base_dir /usr/local/var/orca/rrd/procallator
+base_dir @RRD_DIR@/procallator
-# rrd_dir specifies the location of the generated RRD data files.
+# rrd_dir specifies the location of the generated RRD data files. If
+# rrd_dir is a relative path, then it is made relative to base_dir if
+# base_dir is set.
rrd_dir .
# state_file specifies the location of the state file that remembers
-# the modification time of each source data file.
+# the modification time of each source data file. If state_file is a
+# relative path, then it is made relative to base_dir is base_dir is
+# set.
state_file orca.state
# html_dir specifies the top of the HTML tree created by Orca.
-html_dir /usr/local/www/ramdrive/servers2
+html_dir @HTML_DIR@/procallator
# By default create .meta tag files for all PNGs or GIFs so that the
# web browser will automatically reload them.
-expire_images 0
+expire_images 1
# Find files at the following times:
-# 0:10 to pick up new orcallator files for the new day.
-# 1:00 to pick up late comer orcallator files for the new day.
+# 0:10 to pick up new procallator files for the new day.
+# 1:00 to pick up late comer procallator files for the new day.
# 6:00 to pick up new files before the working day.
# 12:00 to pick up new files during the working day.
# 19:00 to pick up new files after the working day.
@@ -31,8 +38,33 @@
# being updated constantly stops being updated. For mathematical
# expressions use the word `interval' to get the interval number for
# the data source.
-warn_email guilherme.chehab at tco.net.br
-late_interval interval + 30
+warn_email @WARN_EMAIL@
+late_interval interval + 30
+
+# These parameters specify which plots to generate.
+generate_hourly_plot 0
+generate_daily_plot 1
+generate_weekly_plot 1
+generate_monthly_plot 1
+generate_quarterly_plot 1
+generate_yearly_plot 1
+
+# This sets the HTML markup that is placed at the very top of every
+# web page and is primarily used to display the site's logo.
+html_page_header Put your site's logo here.
+
+# This sets the text, that should not be HTML markup, that is used
+# only in the main index.html file. It is used in the
+# element and also placed in the HTML body after the html_page_header
+# in a element index.html file.
+html_top_title Orca Host Status
+
+# This sets the HTML markup that is placed at the bottom of every web
+# page.
+html_page_footer
+
+ These plots brought to you by your local system administrator.
+
# This defines where the find the source data files and the format of
# those files. Notes about the fields:
@@ -45,16 +77,15 @@
# generate a subgroup name, hence all the (?:...) for matching
# anything else.
# interval
-# The interval here must match the interval used by orcallator to
+# The interval here must match the interval used by procallator to
# record data. Do not change this, as it has an effect on the
# generated RRD data files.
-group orcallator {
-find_files /usr/local/var/orca/procallator/(.*)/(?:(?:procallator)|(?:proccol))-\d{4}-\d{2}-\d{2}(?:\.(?:Z|gz|bz2))?
+group procallator {
+find_files @VAR_DIR@/procallator/(.*)/(?:(?:procallator)|(?:proccol))-\d{4}-\d{2}-\d{2}(?:-\d{3,})?(?:\.(?:Z|gz|bz2))?
column_description first_line
date_source column_name timestamp
interval 300
-reopen 1
filename_compare sub {
my ($ay, $am, $ad) = $a =~ /-(\d{4})-(\d\d)-(\d\d)/;
my ($by, $bm, $bd) = $b =~ /-(\d{4})-(\d\d)-(\d\d)/;
@@ -67,30 +98,9 @@
}
}
-# This sets the HTML markup that is placed at the very top of every
-# web page and is primarily used to display the site's logo.
-html_page_header
-
-
-
-# This sets the text, that should not be HTML markup, that is used
-# only in the main index.html file. It is used in the
-# element and also placed in the HTML body after the html_page_header
-# in a element index.html file.
-html_top_title Estado dos servidores TCO/NBT
-
-# This sets the HTML markup that is placed at the bottom of every web
-# page.
-html_page_footer
-
-
- Estes gráficos foram gerados Blair Zajac?s ORCA, and Guilherme Chehab?s Procallator
-
-
-
plot {
title %g Uptime
-source orcallator
+source procallator
data uptime / 86400
data uptime / ( 86400 * 7 )
data uptime / ( 86400 * 30 )
@@ -105,16 +115,12 @@
}
plot {
-title %g Average # Processes in Run Queue (Load Average) & number pf CPUs
-source orcallator
+title %g Average # Processes in Run Queue (Load Average)
+source procallator
data 1runq
-data 5runq
+data 5runq
data 15runq
-data ncpus
-color 00ff00
-color 0000ff
-color ff00ff
-color ff0000
+data ncpus
line_type LINE1
line_type LINE1
line_type LINE1
@@ -122,16 +128,16 @@
legend 1 minute average
legend 5 minute average
legend 15 minute average
-legend CPUs (load threshold)
-y_legend Number of processes and CPUs
+legend Number CPUs
+y_legend Number Processes
data_min 0
-data_max 100
+data_max 1000
href http://www.orcaware.com/orca/docs/orcallator.html#processes_in_run_queue
}
plot {
title %g CPU Usage
-source orcallator
+source procallator
data usr%
data sys%
data nice%
@@ -142,7 +148,7 @@
line_type stack
legend User
legend System
-legend nice
+legend Nice
legend Idle
y_legend Percent
data_min 0
@@ -151,15 +157,15 @@
plot_max 100
rigid_min_max 1
color 00ff00
-color 0000ff
color ff0000
+color 0000ff
color ffffd0
href http://www.orcaware.com/orca/docs/orcallator.html#cpu_usage
}
plot {
title %g New Process Spawn Rate
-source orcallator
+source procallator
data #proc/s
line_type area
line_type line1
@@ -171,8 +177,8 @@
}
plot {
-title %g Number of System & running Processes on cpu
-source orcallator
+title %g Number of System & Running Processes
+source procallator
data #proc
data #proc_oncpu
line_type line1
@@ -189,7 +195,7 @@
plot {
title %g Web Server Hit Rate
-source orcallator
+source procallator
data httpop/s
data http/p5s
line_type area
@@ -205,7 +211,7 @@
plot {
title %g Web Server File Size
-source orcallator
+source procallator
data %to1KB
data %to10KB
data %to100KB
@@ -232,7 +238,7 @@
plot {
title %g Web Server Data Transfer Rate
-source orcallator
+source procallator
data httpb/s
line_type area
legend Bytes/s
@@ -243,7 +249,7 @@
plot {
title %g Web Server HTTP Error Rate
-source orcallator
+source procallator
data htErr/s
line_type area
legend HTTP errors/s
@@ -253,65 +259,43 @@
}
plot {
-title %g Page ins & outs rate
-source orcallator
-data pages_in
-data pages_out
-legend pages in/s
-legend pages out/s
-y_legend Pages/s
-data_min 0
-}
-
-plot {
-title %g Swap ins & outs rate
-source orcallator
-data swap_in
-data swap_out
-legend Swap in/s
-legend Swap out/s
-y_legend Pages/s
-data_min 0
-}
-
-plot {
-title %g Context switches & Interrupts rate
-source orcallator
+title %g Context Switches & Interrupts Rate
+source procallator
data ctxt/s
-data intr/s
+data intr/s
legend Context switches
legend Interrupts
-y_legend rate/s
+y_legend Counts/s
data_min 0
}
plot {
title %g Interface Input Bits Per Second
-source orcallator
-data 8 * if_in_b_(.*)
+source procallator
+data 8 * if_in_b_(.*)
line_type line1
legend $1
y_legend Bits/s
data_min 0
-data_max 100000000
+data_max 1000000000
href http://www.orcaware.com/orca/docs/orcallator.html#interface_bits_per_second
}
plot {
-title %g Interface Ouput Bits Per Second
-source orcallator
+title %g Interface Output Bits Per Second
+source procallator
data 8 * if_out_b_(.*)
line_type line1
legend $1
y_legend Bits/s
data_min 0
-data_max 100000000
+data_max 1000000000
href http://www.orcaware.com/orca/docs/orcallator.html#interface_bits_per_second
}
plot {
title %g Interface Input Packets Per Second
-source orcallator
+source procallator
data if_in_p_(.*)
line_type line1
legend $1
@@ -324,8 +308,8 @@
plot {
title %g Interface Output Packets Per Second
-source orcallator
-data if_out_p_(.*)
+source procallator
+data if_out_p_(.*)
line_type line1
legend $1
y_legend Packets/s
@@ -337,7 +321,7 @@
plot {
title %g Interface Input Errors Per Second
-source orcallator
+source procallator
data if_in_e_(.*)
line_type line1
legend $1
@@ -349,7 +333,7 @@
plot {
title %g Interface Output Errors Per Second
-source orcallator
+source procallator
data if_out_e_(.*)
line_type line1
legend $1
@@ -361,7 +345,7 @@
plot {
title %g Interface Input Dropped Per Second
-source orcallator
+source procallator
data if_in_d_(.*)
line_type line1
legend $1
@@ -373,7 +357,7 @@
plot {
title %g Interface Output Dropped Per Second
-source orcallator
+source procallator
data if_out_d_(.*)
line_type line1
legend $1
@@ -385,7 +369,7 @@
plot {
title %g Interface Output Collisions
-source orcallator
+source procallator
data if_out_cl_(.*)
line_type area
legend $1
@@ -398,7 +382,7 @@
plot {
title %g Interface Output Carrier Losses
-source orcallator
+source procallator
data if_out_ca_(.*)
line_type area
legend $1
@@ -410,62 +394,63 @@
}
plot {
-title %g TCP Current connections
-source orcallator
+title %g TCP Current Connections
+source procallator
data gTcp_(.*)
+line_type area
legend Connections
-y_legend Connections
+y_legend Number Open TCP Connections
data_min 0
flush_regexps 1
}
plot {
-title %g IP statistics
-source orcallator
+title %g IP Statistics
+source procallator
data Ip_(.*)
legend $1 rate
-y_legend rate
+y_legend Counts/s
data_min 0
flush_regexps 1
}
plot {
-title %g TCP statistics
-source orcallator
+title %g TCP Statistics
+source procallator
data Tcp_(.*)
legend $1 rate
-y_legend rate
+y_legend Counts/s
data_min 0
flush_regexps 1
}
plot {
-title %g ICMP statistics
-source orcallator
+title %g ICMP Statistics
+source procallator
data Icmp_(.*)
legend $1 rate
-y_legend rate
+y_legend Counts/s
data_min 0
flush_regexps 1
}
plot {
-title %g UDP statistics
-source orcallator
+title %g UDP Statistics
+source procallator
data Udp_(.*)
legend $1 rate
-y_legend rate
+y_legend Counts/s
data_min 0
flush_regexps 1
}
plot {
title %g NFS Server Statistics
-source orcallator
+source procallator
data nfs_s_(.*)
line_type line1
legend $1/s
-y_legend rate
+y_legend Counts/s
data_min 0
flush_regexps 1
href http://www.orcaware.com/orca/docs/orcallator.html#NFS_server_call_rate
@@ -473,11 +458,11 @@
plot {
title %g NFS Client Statistics
-source orcallator
+source procallator
data nfs_c_(.*)
line_type line1
legend $1/s
-y_legend rate
+y_legend Counts/s
data_min 0
flush_regexps 1
href http://www.orcaware.com/orca/docs/orcallator.html#NFS_server_call_rate
@@ -485,7 +470,7 @@
plot {
title %g Disk System Wide Reads/Writes Per Second
-source orcallator
+source procallator
data disk_rd/s
data disk_wr/s
line_type area
@@ -500,7 +485,7 @@
plot {
title %g Disk System Wide Transfer Rate
-source orcallator
+source procallator
data disk_rB/s
data disk_wB/s
line_type area
@@ -515,7 +500,7 @@
plot {
title %g Disk Reads/Writes Per Second
-source orcallator
+source procallator
data disk_rd_(.*)/s
data disk_wr_(.*)/s
line_type area
@@ -530,7 +515,7 @@
plot {
title %g Disk Transfer Rate
-source orcallator
+source procallator
data disk_rB_(.*)/s
data disk_wB_(.*)/s
line_type area
@@ -545,7 +530,7 @@
plot {
title %g Disk Space Percent Usage
-source orcallator
+source procallator
data mnt_(.*)
line_type line1
legend $1
@@ -558,8 +543,8 @@
}
plot {
-title %g Physical Memory usage percent
-source orcallator
+title %g Physical Memory Usage
+source procallator
data mem_used%
data mem_free%
data mem_shrd%
@@ -572,24 +557,24 @@
line_type stack
legend Used memory
legend Free memory
-legend shared memory
-legend buffer memory
-legend cached memory
-y_legend percent
+legend Shared memory
+legend Buffer memory
+legend Cached memory
+y_legend Percent
data_min 0
data_max 100
href http://www.orcaware.com/orca/docs/orcallator.html#memory_free
}
plot {
-title %g Swap usage percent
-source orcallator
+title %g Swap Usage
+source procallator
data swp_used%
data swp_free%
line_type area
line_type stack
-legend Used swap
-legend Free swap
+legend Swap Used
+legend Swap Free
y_legend percent
data_min 0
data_max 100
@@ -597,8 +582,30 @@
}
plot {
+title %g Page Ins & Outs Rate
+source procallator
+data pages_in
+data pages_out
+legend Pages in/s
+legend Pages out/s
+y_legend Pages/s
+data_min 0
+}
+
+plot {
+title %g Swap Ins & Outs Rate
+source procallator
+data swap_in
+data swap_out
+legend Swap in/s
+legend Swap out/s
+y_legend Pages/s
+data_min 0
+}
+
+plot {
title %g Memory Page Scan Rate
-source orcallator
+source procallator
data scanrate
line_type area
legend Page scan rate
@@ -609,7 +616,7 @@
plot {
title %g Memory Page Residence Time
-source orcallator
+source procallator
data page_rstim
line_type area
legend Page residence time
@@ -620,7 +627,7 @@
plot {
title %g Memory Available Swap Space
-source orcallator
+source procallator
data 1024 * swap_avail
line_type area
legend Available swap space
@@ -632,7 +639,7 @@
plot {
title %g Memory Page Usage
-source orcallator
+source procallator
data pp_kernel
data free_pages
data pagestotl - pp_kernel - free_pages
@@ -656,7 +663,7 @@
plot {
title %g Memory Pages Locked & IO
-source orcallator
+source procallator
data pageslock
data pagesio
line_type area
From blair at orcaware.com Sun Jun 15 13:29:57 2003
From: blair at orcaware.com (Blair Zajac)
Date: Sun, 15 Jun 2003 13:29:57 -0700
Subject: [Orca-checkins] rev 241 - trunk/orca/data_gatherers/procallator
Message-ID: <200306152029.h5FKTv5q032229@orcaware.com>
Author: blair
Date: Sun Jun 15 13:29:55 2003
New Revision: 241
Modified:
trunk/orca/data_gatherers/procallator/TODO
trunk/orca/data_gatherers/procallator/procallator.pl.in
Log:
* data_gatherers/procallator/procallator.pl.in:
This is Perl, so
1) Use Sys::Hostname to determine the system's hostname, not
`hostname`.
2) Use mkdir() instead of `mkdir`.
Rename $OUTDIR to $OUT_DIR.
Remove hardwired paths for $PROC, $COMPRESS, $DEST_DIR and $OUT_DIR.
Use the paths specified by configure.
* data_gatherers/procallator/TODO:
Spell check and wrap to 80 characters.
Modified: trunk/orca/data_gatherers/procallator/TODO
==============================================================================
--- trunk/orca/data_gatherers/procallator/TODO (original)
+++ trunk/orca/data_gatherers/procallator/TODO Sun Jun 15 13:29:55 2003
@@ -1,6 +1,7 @@
Procallator TODO list:
- - Use the same names for data sets as in solaris version for using same config files
- - Document and optimize collectorn source code
+ - Use the same names for data sets as in the Solaris version
+ for using same config files
+ - Document and optimize collector source code
- Write better config file for network and NFS stats
- Add web server stats
- LVM statsi
Modified: trunk/orca/data_gatherers/procallator/procallator.pl.in
==============================================================================
--- trunk/orca/data_gatherers/procallator/procallator.pl.in (original)
+++ trunk/orca/data_gatherers/procallator/procallator.pl.in Sun Jun 15 13:29:55 2003
@@ -1,26 +1,40 @@
-#!/usr/bin/perl -w
+# Collector for /proc statistics for use with Linux 2.2 and 2.4 kernels.
#
-# collector for /proc statistics for use with Linux 2.2 and 2.4 kernels.
-#
-# Copyright (C) 2001 Guilherme Carvalho Chehab. All Rights Reserved.
+# Copyright (C) 2001 Guilherme Carvalho Chehab. All Rights Reserved.
#
# Config variables
-#$PROC="./linux-2.2"; # Proc directory, usually /proc
-$PROC="/proc"; # Proc directory, usually /proc
-$INTERVAL=300; # Interval between each measure, in seconds
-$COMPRESS="/usr/bin/gzip"; # Compressor...
-$HOSTNAME=`/bin/hostname`;
-chomp $HOSTNAME;
-$DEST_DIR="/usr/local/var/orca/$HOSTNAME"; # Destination dir for output files
-#$DEST_DIR="/tmp"; # Destination dir for output files
+
+use Sys::Hostname;
+
+#
+# Configuration variables.
+#
+
+# The process directory, usually /proc.
+my $PROC = '@PROC_DIR@';
+
+# Compression program to use after closing an output data file.
+my $COMPRESS = '@COMPRESSOR@';
+
+# The output base directory.
+my $OUT_DIR = '@VAR_DIR@/procallator';
+
+# Measurement interval, in seconds.
+my $INTERVAL = 300;
# Initializations
-$r=0; # Rotating indice for measuring counter differences
-$rate_ok=0; # Check if is ok to calculate rates
+my $r = 0; # Rotating indice for measuring counter differences.
+my $rate_ok = 0; # Check if is ok to calculate rates.
-# Create output dir if needed
-if (! -d $DEST_DIR ) {
- `mkdir -p $DEST_DIR`;
+# Destination directory for the output data files.
+my $hostname = hostname;
+my $DEST_DIR = "$OUT_DIR/$hostname";
+
+# Create output directory if needed.
+unless (-d $DEST_DIR) {
+ unless (mkdir($DEST_DIR, 0755)) {
+ die "$0: cannot create destiniation directory `$DEST_DIR': $!\n";
+ }
}
# Read kernel version