[Orca-checkins] rev 210 - in branches/orca/import_orca_services_2.0: . lib/Orca_Services data_gatherers data_gatherers/orca_services
sean at seanoneill.info
sean at seanoneill.info
Sun Mar 9 13:02:31 PST 2003
Author: sean at seanoneill.info
Date: 2003-03-09 13:02:12 -0800 (Sun, 09 Mar 2003)
New Revision: 210
Added:
branches/orca/import_orca_services_2.0/data_gatherers/orca_services/start_Orca_Services.sh.in
Removed:
branches/orca/import_orca_services_2.0/data_gatherers/orca_services/start_orca_services.sh.in
Modified:
branches/orca/import_orca_services_2.0/Makefile.in
branches/orca/import_orca_services_2.0/configure.in
branches/orca/import_orca_services_2.0/data_gatherers/Makefile.in
branches/orca/import_orca_services_2.0/data_gatherers/orca_services/Makefile.in
branches/orca/import_orca_services_2.0/data_gatherers/orca_services/Orca_Services.cfg.in
branches/orca/import_orca_services_2.0/data_gatherers/orca_services/Orca_Services.pl.in
branches/orca/import_orca_services_2.0/data_gatherers/orca_services/Orca_Services_running.pl.in
branches/orca/import_orca_services_2.0/data_gatherers/orca_services/README
branches/orca/import_orca_services_2.0/data_gatherers/orca_services/S99Orca_Services.sh.in
branches/orca/import_orca_services_2.0/data_gatherers/orca_services/restart_Orca_Services.sh.in
branches/orca/import_orca_services_2.0/data_gatherers/orca_services/stop_Orca_Services.sh.in
branches/orca/import_orca_services_2.0/lib/Orca_Services/Output.pm
branches/orca/import_orca_services_2.0/lib/Orca_Services/Radius.pm
branches/orca/import_orca_services_2.0/lib/Orca_Services/Vars.pm
Log:
In branches/orca/import_orca_services_2.0:
Moved:
data_gatherers/orca_services/start_orca_services.sh.in
-> data_gatherers/orca_services/start_Orca_Services.sh.in
Modified:
data_gatherers/orca_services/start_orca_services.sh.in
Makefile.in
configure.in
data_gatherers/Makefile.in
data_gatherers/orca_services/Makefile.in
data_gatherers/orca_services/Orca_Services.cfg.in
data_gatherers/orca_services/Orca_Services.pl.in
data_gatherers/orca_services/Orca_Services_running.pl.in
data_gatherers/orca_services/README
data_gatherers/orca_services/S99Orca_Services.sh.in
data_gatherers/orca_services/restart_Orca_Services.sh.in
data_gatherers/orca_services/stop_Orca_Services.sh.in
lib/Orca_Services/Output.pm
lib/Orca_Services/Radius.pm
lib/Orca_Services/Vars.pm
Log:
* In all files above, change all references of orca_services (and a couple of
Orca_services) to Orca_Services.
* lib/Orca_Services/Vars.pm
In addition to changes for Orca_Services, also changed "outputdir" hash
value to "@VAR_DIR@/Orca_Services" and "compress" hash value to
"@COMPRESSOR@". This file needs to be moved to Vars.pm.in next so these
variables will be substituted correctly during configuration.
Modified: branches/orca/import_orca_services_2.0/Makefile.in
==============================================================================
--- branches/orca/import_orca_services_2.0/Makefile.in (original)
+++ branches/orca/import_orca_services_2.0/Makefile.in 2003-03-09 13:02:23.000000000 -0800
@@ -50,8 +50,8 @@
orcallator_run_at_boot:
cd data_gatherers/orcallator && $(MAKE) orcallator_run_at_boot
-orca_services_run_at_boot:
- cd data_gatherers/orca_services && $(MAKE) orca_services_run_at_boot
+Orca_Services_run_at_boot:
+ cd data_gatherers/Orca_Services && $(MAKE) Orca_Services_run_at_boot
test_modules:
cd packages && $(MAKE) CFLAGS="$(CFLAGS)" test_modules
Modified: branches/orca/import_orca_services_2.0/configure.in
==============================================================================
--- branches/orca/import_orca_services_2.0/configure.in (original)
+++ branches/orca/import_orca_services_2.0/configure.in 2003-03-09 13:02:23.000000000 -0800
@@ -510,14 +510,14 @@
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
+ 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
docs/Makefile
lib/Makefile
packages/Makefile
Modified: branches/orca/import_orca_services_2.0/lib/Orca_Services/Radius.pm
==============================================================================
--- branches/orca/import_orca_services_2.0/lib/Orca_Services/Radius.pm (original)
+++ branches/orca/import_orca_services_2.0/lib/Orca_Services/Radius.pm 2003-03-09 13:02:23.000000000 -0800
@@ -40,7 +40,7 @@
use IO::File;
use Sys::Syslog;
use Orca_Services::Vars;
- $Services{Radius}{File} = "/usr/local/lib/orca_services.DB.$nodename";
+ $Services{Radius}{File} = "/usr/local/lib/Orca_Services.DB.$nodename";
$Services{Radius}{FileD} = "";
$Services{Radius}{Ok} = -1;
$Services{Radius}{External} = 1;
@@ -126,7 +126,7 @@
$mon++;
- $BASE_ACCUM_radius_DB="/var/orca/orca_services/$nodename";
+ $BASE_ACCUM_radius_DB="/var/orca/Orca_Services/$nodename";
if ($mon<10) {
$ACCUM_radius_DB= "$BASE_ACCUM_radius_DB/radiatorRadiusAccum.$year"."0"."$mon.txt";
} else {
Modified: branches/orca/import_orca_services_2.0/lib/Orca_Services/Vars.pm
==============================================================================
--- branches/orca/import_orca_services_2.0/lib/Orca_Services/Vars.pm (original)
+++ branches/orca/import_orca_services_2.0/lib/Orca_Services/Vars.pm 2003-03-09 13:02:23.000000000 -0800
@@ -50,7 +50,7 @@
#
use vars qw($progname);
push(@EXPORT, qw($progname));
-$progname = "orca_services";
+$progname = "Orca_Services";
#
# vars for syslogging
@@ -96,8 +96,8 @@
push(@EXPORT, qw(%Services %Options %PrgOptions %HelpText));
%Services=();
%Options=("interval" => 300,
- "outputdir" => "/opt/SWorca/var/orca/orca_services",
- "compress" => "/usr/bin/gzip -9",
+ "outputdir" => "@VAR_DIR@/Orca_Services",
+ "compress" => "@COMPRESSOR@",
"debug" => 0,
"help" => 0
);
Modified: branches/orca/import_orca_services_2.0/lib/Orca_Services/Output.pm
==============================================================================
--- branches/orca/import_orca_services_2.0/lib/Orca_Services/Output.pm (original)
+++ branches/orca/import_orca_services_2.0/lib/Orca_Services/Output.pm 2003-03-09 13:02:24.000000000 -0800
@@ -83,10 +83,10 @@
$now_string = strftime "%Y-%m-%d", localtime;
my $subday = 0;
- my $tempfilename = "$outputdir/orca_services-" . $now_string . "-" . sprintf("%03d", $subday);
+ my $tempfilename = "$outputdir/Orca_Services-" . $now_string . "-" . sprintf("%03d", $subday);
while (-f $tempfilename) {
$subday ++;
- $tempfilename = "$outputdir/orca_services-" . $now_string . "-" . sprintf("%03d", $subday);
+ $tempfilename = "$outputdir/Orca_Services-" . $now_string . "-" . sprintf("%03d", $subday);
}
$OutputFilename = $tempfilename;
Modified: branches/orca/import_orca_services_2.0/data_gatherers/Makefile.in
==============================================================================
--- branches/orca/import_orca_services_2.0/data_gatherers/Makefile.in (original)
+++ branches/orca/import_orca_services_2.0/data_gatherers/Makefile.in 2003-03-09 13:02:24.000000000 -0800
@@ -1,7 +1,7 @@
@SET_MAKE@
SUBDIRS = orcallator \
- orca_services
+ Orca_Services
all: Makefile $(TARGETS)
@for dir in $(SUBDIRS); do \
@@ -12,8 +12,8 @@
orcallator_run_at_boot:
cd orcallator && $(MAKE) orcallator_run_at_boot
-orca_services_run_at_boot:
- cd orca_services && $(MAKE) orca_services_run_at_boot
+Orca_Services_run_at_boot:
+ cd Orca_Services && $(MAKE) Orca_Services_run_at_boot
install:
@for dir in $(SUBDIRS); do \
Modified: branches/orca/import_orca_services_2.0/data_gatherers/orca_services/Makefile.in
==============================================================================
--- branches/orca/import_orca_services_2.0/data_gatherers/orca_services/Makefile.in (original)
+++ branches/orca/import_orca_services_2.0/data_gatherers/orca_services/Makefile.in 2003-03-09 13:02:24.000000000 -0800
@@ -13,21 +13,21 @@
RRD_DIR = @RRD_DIR@
INIT_D_DIR = @INIT_D_DIR@
RCX_D_CONTAINING_DIR = @RCX_D_CONTAINING_DIR@
-RAW_ORCA_SERVICES_DIR = $(VAR_DIR)/orca_services
-RRD_ORCA_SERVICES_DIR = $(RRD_DIR)/orca_services
+RAW_ORCA_SERVICES_DIR = $(VAR_DIR)/Orca_Services
+RRD_ORCA_SERVICES_DIR = $(RRD_DIR)/Orca_Services
-BIN_PERL_SCRIPTS = orca_services_running
-LIBEXEC_PERL_SCRIPTS = orca_services
+BIN_PERL_SCRIPTS = Orca_Services_running
+LIBEXEC_PERL_SCRIPTS = Orca_Services
NOINST_PERL_SCRIPTS =
PERL_SCRIPTS = $(BIN_PERL_SCRIPTS) \
$(LIBEXEC_PERL_SCRIPTS) \
$(NOINST_PERL_SCRIPTS)
-BIN_SHELL_SCRIPTS = restart_orca_services \
- stop_orca_services \
- start_orca_services
-LIBEXEC_SHELL_SCRIPTS = orca_services
-NOINST_SHELL_SCRIPTS = S99orca_services
+BIN_SHELL_SCRIPTS = restart_Orca_Services \
+ stop_Orca_Services \
+ start_Orca_Services
+LIBEXEC_SHELL_SCRIPTS = Orca_Services
+NOINST_SHELL_SCRIPTS = S99Orca_Services
SHELL_SCRIPTS = $(BIN_SHELL_SCRIPTS) \
$(LIBEXEC_SHELL_SCRIPTS) \
$(NOINST_SHELL_SCRIPTS)
@@ -39,7 +39,7 @@
LIBEXEC_TARGETS = $(LIBEXEC_PERL_SCRIPTS) \
$(LIBEXEC_SHELL_SCRIPTS)
-all: Makefile $(TARGETS) orca_services.cfg
+all: Makefile $(TARGETS) Orca_Services.cfg
install: all
$(MKDIR) $(bindir)
@@ -55,28 +55,28 @@
echo $(INSTALL) $$file $(libexecdir); \
$(INSTALL) $$file $(libexecdir); \
done
- if test -r $(sysconfdir)/orca_services.cfg; then \
- cp -p $(sysconfdir)/orca_services.cfg $(sysconfdir)/orca_services.cfg.`date +%Y-%m-%d-%H:%M:%S`; \
+ if test -r $(sysconfdir)/Orca_Services.cfg; then \
+ cp -p $(sysconfdir)/Orca_Services.cfg $(sysconfdir)/Orca_Services.cfg.`date +%Y-%m-%d-%H:%M:%S`; \
fi
- $(INSTALL) -m 0644 orca_services.cfg $(sysconfdir)
+ $(INSTALL) -m 0644 Orca_Services.cfg $(sysconfdir)
-orca_services_run_at_boot: all
+Orca_Services_run_at_boot: all
test "$(INIT_D_DIR)"
test "$(RCX_D_CONTAINING_DIR)"
- -$(RM) $(INIT_D_DIR)/orca_services
- -$(RM) $(RCX_D_CONTAINING_DIR)/rc0.d/K01orca_services
- -$(RM) $(RCX_D_CONTAINING_DIR)/rc1.d/K01orca_services
- -$(RM) $(RCX_D_CONTAINING_DIR)/rc3.d/S99orca_services
- $(INSTALL) -m 0744 S99orca_services $(INIT_D_DIR)/orca_services
- ln $(INIT_D_DIR)/orca_services $(RCX_D_CONTAINING_DIR)/rc0.d/K01orca_services
- ln $(INIT_D_DIR)/orca_services $(RCX_D_CONTAINING_DIR)/rc1.d/K01orca_services
- ln $(INIT_D_DIR)/orca_services $(RCX_D_CONTAINING_DIR)/rc3.d/S99orca_services
+ -$(RM) $(INIT_D_DIR)/Orca_Services
+ -$(RM) $(RCX_D_CONTAINING_DIR)/rc0.d/K01Orca_Services
+ -$(RM) $(RCX_D_CONTAINING_DIR)/rc1.d/K01Orca_Services
+ -$(RM) $(RCX_D_CONTAINING_DIR)/rc3.d/S99Orca_Services
+ $(INSTALL) -m 0744 S99Orca_Services $(INIT_D_DIR)/Orca_Services
+ ln $(INIT_D_DIR)/Orca_Services $(RCX_D_CONTAINING_DIR)/rc0.d/K01Orca_Services
+ ln $(INIT_D_DIR)/Orca_Services $(RCX_D_CONTAINING_DIR)/rc1.d/K01Orca_Services
+ ln $(INIT_D_DIR)/Orca_Services $(RCX_D_CONTAINING_DIR)/rc3.d/S99Orca_Services
clean:
$(RM) $(TARGETS)
distclean: clean
- $(RM) *.sh orca_services.cfg orca_services_running.pl Makefile
+ $(RM) *.sh Orca_Services.cfg Orca_Services_running.pl Makefile
.SUFFIXES: .pl .sh
@@ -89,26 +89,26 @@
chmod 0755 $@
Makefile: Makefile.in
- cd ../.. && CONFIG_FILES=data_gatherers/orca_services/Makefile ./config.status
+ cd ../.. && CONFIG_FILES=data_gatherers/Orca_Services/Makefile ./config.status
$(MAKE)
-orca_services.cfg: orca_services.cfg.in
- cd ../.. && CONFIG_FILES=data_gatherers/orca_services/orca_services.cfg ./config.status
+Orca_Services.cfg: Orca_Services.cfg.in
+ cd ../.. && CONFIG_FILES=data_gatherers/Orca_Services/Orca_Services.cfg ./config.status
-orca_services.pl: orca_services.pl.in
- cd ../.. && CONFIG_FILES=data_gatherers/orca_services/orca_services.pl ./config.status
+Orca_Services.pl: Orca_Services.pl.in
+ cd ../.. && CONFIG_FILES=data_gatherers/Orca_Services/Orca_Services.pl ./config.status
-orca_services_running.pl: orca_services_running.pl.in
- cd ../.. && CONFIG_FILES=data_gatherers/orca_services/orca_services_running.pl ./config.status
+Orca_Services_running.pl: Orca_Services_running.pl.in
+ cd ../.. && CONFIG_FILES=data_gatherers/Orca_Services/Orca_Services_running.pl ./config.status
-restart_orca_services.sh: restart_orca_services.sh.in
- cd ../.. && CONFIG_FILES=data_gatherers/orca_services/restart_orca_services.sh ./config.status
+restart_Orca_Services.sh: restart_Orca_Services.sh.in
+ cd ../.. && CONFIG_FILES=data_gatherers/Orca_Services/restart_Orca_Services.sh ./config.status
-start_orca_services.sh: start_orca_services.sh.in
- cd ../.. && CONFIG_FILES=data_gatherers/orca_services/start_orca_services.sh ./config.status
+start_Orca_Services.sh: start_Orca_Services.sh.in
+ cd ../.. && CONFIG_FILES=data_gatherers/Orca_Services/start_Orca_Services.sh ./config.status
-stop_orca_services.sh: stop_orca_services.sh.in
- cd ../.. && CONFIG_FILES=data_gatherers/orca_services/stop_orca_services.sh ./config.status
+stop_Orca_Services.sh: stop_Orca_Services.sh.in
+ cd ../.. && CONFIG_FILES=data_gatherers/Orca_Services/stop_Orca_Services.sh ./config.status
-S99orca_services.sh: S99orca_services.sh.in
- cd ../.. && CONFIG_FILES=data_gatherers/orca_services/S99orca_services.sh ./config.status
+S99Orca_Services.sh: S99Orca_Services.sh.in
+ cd ../.. && CONFIG_FILES=data_gatherers/Orca_Services/S99Orca_Services.sh ./config.status
Copied: start_Orca_Services.sh.in (from rev 209, branches/orca/import_orca_services_2.0/data_gatherers/orca_services/start_orca_services.sh.in)
Modified: branches/orca/import_orca_services_2.0/data_gatherers/orca_services/Orca_Services_running.pl.in
==============================================================================
--- branches/orca/import_orca_services_2.0/data_gatherers/orca_services/Orca_Services_running.pl.in (original)
+++ branches/orca/import_orca_services_2.0/data_gatherers/orca_services/Orca_Services_running.pl.in 2003-03-09 13:02:24.000000000 -0800
@@ -1,4 +1,4 @@
-# orca_services_running: warn if orca_services files are not up to date.
+# Orca_Services_running: warn if Orca_Services files are not up to date.
#
# Copyright (C) 2000 Carlos Canau and KPNQwest Portugal
# Copyright (C) 1998, 1999 Blair Zajac and Yahoo!, Inc.
@@ -8,7 +8,7 @@
# Set this to the list of directories that contain the output from
# percoservices.se.
-my @stats_dirs = ('@VAR_DIR@/orca_services');
+my @stats_dirs = ('@VAR_DIR@/Orca_Services');
foreach my $stats_dir (@stats_dirs) {
Modified: branches/orca/import_orca_services_2.0/data_gatherers/orca_services/Orca_Services.pl.in
==============================================================================
--- branches/orca/import_orca_services_2.0/data_gatherers/orca_services/Orca_Services.pl.in (original)
+++ branches/orca/import_orca_services_2.0/data_gatherers/orca_services/Orca_Services.pl.in 2003-03-09 13:02:24.000000000 -0800
@@ -1,4 +1,4 @@
-# orca_services.pl, a log generating services usage monitor
+# Orca_Services.pl, a log generating services usage monitor
#
# This program logs many different services usage to a log file
# for later processing.
Modified: branches/orca/import_orca_services_2.0/data_gatherers/orca_services/restart_Orca_Services.sh.in
==============================================================================
--- branches/orca/import_orca_services_2.0/data_gatherers/orca_services/restart_Orca_Services.sh.in (original)
+++ branches/orca/import_orca_services_2.0/data_gatherers/orca_services/restart_Orca_Services.sh.in 2003-03-09 13:02:24.000000000 -0800
@@ -1,12 +1,12 @@
#!/bin/sh
-# This stops and restarts orca_services.
+# This stops and restarts Orca_Services.
prefix=@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@
-# Kill any running orca_servicess.
-$bindir/stop_orca_services
+# Kill any running Orca_Servicess.
+$bindir/stop_Orca_Services
-# Start the orca_services.
-$bindir/start_orca_services
+# Start the Orca_Services.
+$bindir/start_Orca_Services
Modified: branches/orca/import_orca_services_2.0/data_gatherers/orca_services/stop_Orca_Services.sh.in
==============================================================================
--- branches/orca/import_orca_services_2.0/data_gatherers/orca_services/stop_Orca_Services.sh.in (original)
+++ branches/orca/import_orca_services_2.0/data_gatherers/orca_services/stop_Orca_Services.sh.in 2003-03-09 13:02:24.000000000 -0800
@@ -12,16 +12,16 @@
PSCMD="/usr/ucb/ps" # Solaris
fi
-pids=`$PSCMD auxww | $AWK '/orca_services/ && !/awk/ && !/stop_orca_services/ && !/ \/etc\/init\.d/ && !/ \/etc\/rc/ {print $2}'`
+pids=`$PSCMD auxww | $AWK '/Orca_Services/ && !/awk/ && !/stop_Orca_Services/ && !/ \/etc\/init\.d/ && !/ \/etc\/rc/ {print $2}'`
if test "$pids" != ""; then
echo "Killing pids $pids."
kill -HUP $pids
sleep 1
- pids=`$PSCMD auxww | $AWK '/orca_services/ && !/awk/ && !/stop_orca_services/ && !/ \/etc\/init\.d/ && !/ \/etc\/rc/ {print $2}'`
+ pids=`$PSCMD auxww | $AWK '/Orca_Services/ && !/awk/ && !/stop_Orca_Services/ && !/ \/etc\/init\.d/ && !/ \/etc\/rc/ {print $2}'`
if test "$pids" != ""; then
kill -TERM $pids
sleep 1
- pids=`$PSCMD auxww | $AWK '/orca_services/ && !/awk/ && !/stop_orca_services/ && !/ \/etc\/init\.d/ && !/ \/etc\/rc/ {print $2}'`
+ pids=`$PSCMD auxww | $AWK '/Orca_Services/ && !/awk/ && !/stop_Orca_Services/ && !/ \/etc\/init\.d/ && !/ \/etc\/rc/ {print $2}'`
if test "$pids" != ""; then
kill -9 $pids
sleep 1
Modified: branches/orca/import_orca_services_2.0/data_gatherers/orca_services/Orca_Services.cfg.in
==============================================================================
--- branches/orca/import_orca_services_2.0/data_gatherers/orca_services/Orca_Services.cfg.in (original)
+++ branches/orca/import_orca_services_2.0/data_gatherers/orca_services/Orca_Services.cfg.in 2003-03-09 13:02:24.000000000 -0800
@@ -1,4 +1,4 @@
-# Orca configuration file for orca_services files.
+# Orca configuration file for Orca_Services files.
# Require at least this version of Orca.
require 0.27
@@ -6,7 +6,7 @@
# 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 @RRD_DIR@/orca_services
+base_dir @RRD_DIR@/Orca_Services
# 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
@@ -18,15 +18,15 @@
# relative path, then it is made relative to base_dir is base_dir is
# set.
state_file orca.state
-html_dir @HTML_DIR@/orca_services
+html_dir @HTML_DIR@/Orca_Services
# By default create .meta tag files for all PNGs or GIFs so that the
# web browser will automatically reload them.
expire_images 1
# Find files at the following times:
-# 0:10 to pick up new orca_services files for the new day.
-# 1:00 to pick up late comer orca_services files for the new day.
+# 0:10 to pick up new Orca_Services files for the new day.
+# 1:00 to pick up late comer Orca_Services 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.
@@ -58,11 +58,11 @@
# generate a subgroup name, hence all the (?:...) for matching
# anything else.
# interval
-# The interval here must match the interval used by orca_services to
+# The interval here must match the interval used by Orca_Services to
# record data. Do not change this, as it has an effect on the
# generated RRD data files.
-group orca_services {
-find_files @VAR_DIR@/orca_services/(.*)/(?:(?:orca_services)|(?:orcaservices))-\d{4}-\d{2}-\d{2}(?:-\d{3,})?(?:\.(?:Z|gz|bz2))?
+group Orca_Services {
+find_files @VAR_DIR@/Orca_Services/(.*)/(?:(?:Orca_Services)|(?:orcaservices))-\d{4}-\d{2}-\d{2}(?:-\d{3,})?(?:\.(?:Z|gz|bz2))?
column_description first_line
date_source column_name timestamp
interval 300
@@ -82,7 +82,7 @@
#
# ATTENTION: change this to your values
#
-html_top_title Orca_services Status
+html_top_title Orca_Services Status
#
# ATTENTION: change this to your values
@@ -98,19 +98,19 @@
plot {
title %g SMTP Mail Queue
-source orca_services
+source Orca_Services
data mailq_total
legend Msgs. in queue (5m)
y_legend Number of Messages
line_type line2
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#SMTP_Mail_Queue
+href http://o-s.kpnqwest.pt/Orca_Services.html#SMTP_Mail_Queue
}
plot {
title %g SMTP Messages in 5 minutes
-source orca_services
+source Orca_Services
data smtp_from
data smtp_sent
legend Messages In (5m)
@@ -118,12 +118,12 @@
y_legend Number of Messages
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#SMTP_Messages_in_5_minutes
+href http://o-s.kpnqwest.pt/Orca_Services.html#SMTP_Messages_in_5_minutes
}
plot {
title %g SMTP Virus & Spam in 5 minutes
-source orca_services
+source Orca_Services
data smtp_virus
data smtp_spam
legend Virus (5m)
@@ -131,12 +131,12 @@
y_legend Number of Messages
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html
+href http://o-s.kpnqwest.pt/Orca_Services.html
}
plot {
title %g SMTP Failed
-source orca_services
+source Orca_Services
data smtp_torf
data smtp_c_ml
data smtp_c_rt
@@ -148,12 +148,12 @@
y_legend Number of Messages
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#SMTP_Failed
+href http://o-s.kpnqwest.pt/Orca_Services.html#SMTP_Failed
}
plot {
title %g SMTP Size
-source orca_services
+source Orca_Services
data smtp_sizes
data smtp_tops
line_type area
@@ -163,12 +163,12 @@
y_legend Message size (bytes)
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#SMTP_Size
+href http://o-s.kpnqwest.pt/Orca_Services.html#SMTP_Size
}
plot {
title %g SMTP Delay
-source orca_services
+source Orca_Services
data smtp_delay
data smtp_maxd
line_type area
@@ -178,12 +178,12 @@
y_legend Message Delay (seconds)
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#SMTP_Delay
+href http://o-s.kpnqwest.pt/Orca_Services.html#SMTP_Delay
}
plot {
title %g SMTP Retries and Queueing
-source orca_services
+source Orca_Services
data smtp_rtrs
data smtp_queued
legend Retries (5m)
@@ -191,12 +191,12 @@
y_legend Number of Messages
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#SMTP_Retries_and_Queueing
+href http://o-s.kpnqwest.pt/Orca_Services.html#SMTP_Retries_and_Queueing
}
plot {
title %g SMTP DSN and Undefs
-source orca_services
+source Orca_Services
data smtp_dsns
data smtp_undf
legend Number of DSNs (5m)
@@ -204,18 +204,18 @@
y_legend Number of Messages
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#SMTP_DSN_and_Undefs
+href http://o-s.kpnqwest.pt/Orca_Services.html#SMTP_DSN_and_Undefs
}
plot {
title %g SMTP Over Quota in 5 minutes
-source orca_services
+source Orca_Services
data smtp_overquota
legend Over Quota (5m)
y_legend Number of Messages
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html
+href http://o-s.kpnqwest.pt/Orca_Services.html
}
@@ -223,7 +223,7 @@
plot {
title %g MERIT RADIUS AUTH in 5 minutes
-source orca_services
+source Orca_Services
data radius_auth
data radius_auth_ok
data radius_auth_nok
@@ -233,12 +233,12 @@
y_legend Number of Auth Packets
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#MERIT_RADIUS_AUTH_in_5_minutes
+href http://o-s.kpnqwest.pt/Orca_Services.html#MERIT_RADIUS_AUTH_in_5_minutes
}
plot {
title %g MERIT RADIUS ACCT in 5 minutes
-source orca_services
+source Orca_Services
data radius_acct_start
data radius_acct_stop
legend Start records (5m)
@@ -246,12 +246,12 @@
y_legend Number of Acct Packets
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#MERIT_RADIUS_ACCT_in_5_minutes
+href http://o-s.kpnqwest.pt/Orca_Services.html#MERIT_RADIUS_ACCT_in_5_minutes
}
plot {
title %g MERIT RADIUS REMOTE AUTH in 5 minutes
-source orca_services
+source Orca_Services
data radius_rem_auth
data radius_rem_auth_ok
data radius_rem_auth_nok
@@ -261,25 +261,25 @@
y_legend Number of Remote Auth Packets
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#MERIT_RADIUS_REMOTE_AUTH_in_5_minutes
+href http://o-s.kpnqwest.pt/Orca_Services.html#MERIT_RADIUS_REMOTE_AUTH_in_5_minutes
}
plot {
title %g MERIT RADIUS UNDEFS in 5 minutes
-source orca_services
+source Orca_Services
data radius_undefs
legend Undef lines (5m)
y_legend Number of undef lines
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#MERIT_RADIUS_UNDEFS_in_5_minutes
+href http://o-s.kpnqwest.pt/Orca_Services.html#MERIT_RADIUS_UNDEFS_in_5_minutes
}
plot {
title %g POP SESSIONS in 5 minutes
-source orca_services
+source Orca_Services
data pop_connect
data pop_login
data pop_logout
@@ -289,12 +289,12 @@
y_legend Units in 5 minutes
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#POP_SESSIONS_in_5_minutes
+href http://o-s.kpnqwest.pt/Orca_Services.html#POP_SESSIONS_in_5_minutes
}
plot {
title %g POP DENIED in 5 minutes
-source orca_services
+source Orca_Services
data pop_failure
data pop_refused
legend Failures (5m)
@@ -302,12 +302,12 @@
y_legend Units in 5 minutes
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#POP_DENIED_in_5_minutes
+href http://o-s.kpnqwest.pt/Orca_Services.html#POP_DENIED_in_5_minutes
}
plot {
title %g POP FAILURES in 5 minutes
-source orca_services
+source Orca_Services
data pop_net_error
data pop_local_error
legend Network errors (5m)
@@ -315,73 +315,73 @@
y_legend Units in 5 minutes
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#POP_FAILURES_in_5_minutes
+href http://o-s.kpnqwest.pt/Orca_Services.html#POP_FAILURES_in_5_minutes
}
plot {
title %g POP UNDEFS in 5 minutes
-source orca_services
+source Orca_Services
data pop_undefs
legend Undefs (5m)
y_legend Units in 5 minutes
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#POP_UNDEFS_in_5_minutes
+href http://o-s.kpnqwest.pt/Orca_Services.html#POP_UNDEFS_in_5_minutes
}
plot {
title %g Radius time usage
-source orca_services
+source Orca_Services
line_type line2
data rad_time / 60
legend Time consumption (5 min)
y_legend Minutes
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#Radius_time_usage
+href http://o-s.kpnqwest.pt/Orca_Services.html#Radius_time_usage
}
plot {
title %g Radius accumulated time usage
-source orca_services
+source Orca_Services
line_type line2
data radius_inc_time / 60
legend Time consumption (5 min)
y_legend Minutes
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#Radius_time_usage
+href http://o-s.kpnqwest.pt/Orca_Services.html#Radius_time_usage
}
plot {
title %g Radius sessions
-source orca_services
+source Orca_Services
line_type line2
data rad_sessions
legend Number of Sessions (5 min)
y_legend Terminated Sessions
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#Radius_sessions
+href http://o-s.kpnqwest.pt/Orca_Services.html#Radius_sessions
}
plot {
title %g Radius accumulated sessions
-source orca_services
+source Orca_Services
line_type line2
data radius_inc_sessions
legend Number of Sessions (5 min)
y_legend Terminated Sessions
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#Radius_sessions
+href http://o-s.kpnqwest.pt/Orca_Services.html#Radius_sessions
}
plot {
title %g NAMED CPU Usage in 10 minutes
-source orca_services
+source Orca_Services
data dns_cpu_u
data dns_cpu_s
data dns_ccpu_u
@@ -397,12 +397,12 @@
y_legend Seconds in 10 minutes
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#NAMED_CPU_Usage_in_1_hour
+href http://o-s.kpnqwest.pt/Orca_Services.html#NAMED_CPU_Usage_in_1_hour
}
plot {
title %g NAMED Major queries
-source orca_services
+source Orca_Services
data dns_a
data dns_ptr
data dns_mx
@@ -418,12 +418,12 @@
y_legend Units in 10 minutes
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#NAMED_Major_queries
+href http://o-s.kpnqwest.pt/Orca_Services.html#NAMED_Major_queries
}
plot {
title %g NAMED Minor queries
-source orca_services
+source Orca_Services
data dns_ns
data dns_soa
data dns_axfr
@@ -442,12 +442,12 @@
y_legend Units in 10 minutes
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#NAMED_Minor_queries
+href http://o-s.kpnqwest.pt/Orca_Services.html#NAMED_Minor_queries
}
plot {
title %g NAMED Received
-source orca_services
+source Orca_Services
data dns_rr
data dns_rq
data dns_rother
@@ -460,12 +460,12 @@
y_legend Units in 10 minutes
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#NAMED_Received
+href http://o-s.kpnqwest.pt/Orca_Services.html#NAMED_Received
}
plot {
title %g NAMED Sent
-source orca_services
+source Orca_Services
data dns_sans
data dns_snaans
data dns_snxd
@@ -481,24 +481,24 @@
y_legend Units in 10 minutes
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#NAMED_Sent
+href http://o-s.kpnqwest.pt/Orca_Services.html#NAMED_Sent
}
plot {
title %g HTTP Processes
-source orca_services
+source Orca_Services
data http_procs
line_type line2
legend HTTP Processes
y_legend Number of processes
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#HTTP_Processes
+href http://o-s.kpnqwest.pt/Orca_Services.html#HTTP_Processes
}
plot {
title %g HTTP requests
-source orca_services
+source Orca_Services
data http_hits
data http_condgets
data http_gets
@@ -523,24 +523,24 @@
y_legend Units in 5 minutes
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#HTTP_requests
+href http://o-s.kpnqwest.pt/Orca_Services.html#HTTP_requests
}
plot {
title %g HTTP Bps
-source orca_services
+source Orca_Services
data http_Bps
line_type line2
legend HTTP bandwidth
y_legend BYTES per Second
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html#HTTP_Bps
+href http://o-s.kpnqwest.pt/Orca_Services.html#HTTP_Bps
}
plot {
title %g HTTP request size
-source orca_services
+source Orca_Services
data http_1k * 100
data http_10k * 100
data http_100k * 100
@@ -559,14 +559,14 @@
y_legend Percent
data_min 0
data_max 120
-href http://o-s.kpnqwest.pt/orca_services.html#HTTP_request_size
+href http://o-s.kpnqwest.pt/Orca_Services.html#HTTP_request_size
}
plot {
title %g NNTP Statistics in 5 minutes
-source orca_services
+source Orca_Services
data nntpcache_connects
data nntpcache_groups
data nntpcache_articles
@@ -576,12 +576,12 @@
y_legend Units in 5 minutes
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html
+href http://o-s.kpnqwest.pt/Orca_Services.html
}
plot {
title %g SLAPD Statistics in 5 minutes
-source orca_services
+source Orca_Services
data slapd_binds
data slapd_searchs
legend BINDs (5m)
@@ -589,6 +589,6 @@
y_legend Units in 5 minutes
data_min 0
data_max U
-href http://o-s.kpnqwest.pt/orca_services.html
+href http://o-s.kpnqwest.pt/Orca_Services.html
}
Modified: branches/orca/import_orca_services_2.0/data_gatherers/orca_services/S99Orca_Services.sh.in
==============================================================================
--- branches/orca/import_orca_services_2.0/data_gatherers/orca_services/S99Orca_Services.sh.in (original)
+++ branches/orca/import_orca_services_2.0/data_gatherers/orca_services/S99Orca_Services.sh.in 2003-03-09 13:02:24.000000000 -0800
@@ -6,19 +6,19 @@
case "$1" in
'start')
- if [ -x $bindir/start_orca_services.sh ]; then
+ if [ -x $bindir/start_Orca_Services.sh ]; then
umask 022
- $bindir/start_orca_services.sh
+ $bindir/start_Orca_Services.sh
else
- echo "$0: $bindir/start_orca_services.sh does not exist or is not executable."
+ echo "$0: $bindir/start_Orca_Services.sh does not exist or is not executable."
fi
;;
'stop')
- if [ -x $bindir/stop_orca_services.sh ]; then
- $bindir/stop_orca_services.sh
+ if [ -x $bindir/stop_Orca_Services.sh ]; then
+ $bindir/stop_Orca_Services.sh
else
- echo "$0: $bindir/stop_orca_services.sh does not exist or is not executable."
+ echo "$0: $bindir/stop_Orca_Services.sh does not exist or is not executable."
fi
;;
Modified: branches/orca/import_orca_services_2.0/data_gatherers/orca_services/README
==============================================================================
--- branches/orca/import_orca_services_2.0/data_gatherers/orca_services/README (original)
+++ branches/orca/import_orca_services_2.0/data_gatherers/orca_services/README 2003-03-09 13:02:24.000000000 -0800
@@ -1,6 +1,6 @@
##
##
-## Orca_services: a log generating services usage monitor
+## Orca_Services: a log generating services usage monitor
##
##
@@ -22,29 +22,29 @@
##
PERL_SCRIPTS
- orca_services_running
- warn if orca_services files are not up to date.
+ Orca_Services_running
+ warn if Orca_Services files are not up to date.
Not changed by canau.
- orca_services
+ Orca_Services
main data collector
SHELL_SCRIPTS
- restart_orca_services
+ restart_Orca_Services
guess!
- stop_orca_services
+ stop_Orca_Services
I'll give you a hint... stopping
- start_orca_services
+ start_Orca_Services
need a hint, look above
- S99orca_services
- used for automatic start of orca_services
+ S99Orca_Services
+ used for automatic start of Orca_Services
Other Files:
- orca_services.cfg
+ Orca_Services.cfg
Configuration of services to monitor
graph details etc
- $libdir/orca_services.$HOSTNAME
+ $libdir/Orca_Services.$HOSTNAME
services can be disabled editing this file.
$libdir defaults to /usr/local/lib
@@ -52,7 +52,7 @@
the switch for input file and setting it to off: ex:
--smtp_logfile=off
- $libdir/orca_services.DB.$HOSTNAME
+ $libdir/Orca_Services.DB.$HOSTNAME
$libdir defaults to /usr/local/lib
auth info for accessing database
SYNTAX: proto:drv:database:user:pass
@@ -75,16 +75,16 @@
make
make install
- * if orca_services should run at boottime
+ * if Orca_Services should run at boottime
- make orca_services_run_at_boot
+ make Orca_Services_run_at_boot
- Most of the skeleton code of orca_services comes from orcallator. So
+ Most of the skeleton code of Orca_Services comes from orcallator. So
everything is very similar.
-4) You might need to edit orca_services to suit your needs. Look for
+4) You might need to edit Orca_Services to suit your needs. Look for
code need the ATTENTION string. You'll probably need to edit
- orca_services.cfg.in.
+ Orca_Services.cfg.in.
###########################################################################
@@ -121,13 +121,13 @@
RADIUS FROM DATABASE
--------------------
-DEFAULT: $def_radius_auth = "/usr/local/lib/orca_services.DB.$nodename";
+DEFAULT: $def_radius_auth = "/usr/local/lib/Orca_Services.DB.$nodename";
DISABLE: --radius_db=off
Reads Radius stop records from Database and do stats. You
might need to change the SQL query in the code. You'll have
- to create the orca_services.DB.$hostname file with the database
+ to create the Orca_Services.DB.$hostname file with the database
options.
MAILQ
Deleted: branches/orca/import_orca_services_2.0/data_gatherers/orca_services/start_orca_services.sh.in
==============================================================================
--- branches/orca/import_orca_services_2.0/data_gatherers/orca_services/start_orca_services.sh.in (original)
+++ branches/orca/import_orca_services_2.0/data_gatherers/orca_services/start_orca_services.sh.in 2003-03-09 13:02:24.000000000 -0800
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-# This script runs Orca_Services with the proper options for your site.
-
-# Define program locations that will be needed.
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libexecdir@
-AWK=@AWK@
-CUT=@CUT@
-UNAME=@UNAME@
-ORCA_SERVICES_DIR=@VAR_DIR@/Orca_Services
-
-# Get the hostname without the fully qualified part; that is, trim off
-# anything past the first `.'.
-uname=`$UNAME -n | $CUT -d. -f1`
-
-OPERSYS=`$UNAME -s`
-if test "${OPERSYS}" = "Linux"; then
- PSCMD="/bin/ps auxww"
-else
- PSCMD="/usr/bin/ps -ef" # Solaris
-fi
-
-# The directory these files go into is $ORCA_SERVICES_DIR/HOSTNAME
-OUTDIR=$ORCA_SERVICES_DIR/$uname
-
-# Export the environmental variables.
-export OUTDIR
-
-# Check if Orca_Services is already running.
-pids=`$PSCMD | $AWK '/Orca_Services/ && !/awk/ && !/start_Orca_Services/ && !/daemon/ && !/ \/etc\/init\.d/ && !/ \/etc\/rc/ {print $2}'`
-if test "$pids" != ""; then
- echo "Orca_Services already running. Exiting."
- exit 1
-fi
-
-echo "Writing data into $OUTDIR/"
-
-# Cd to / so that any automounted filesystems can be unmounted.
-cd /
-
-# Create the output directory if it doesn't exist yet.
-if test ! -d $OUTDIR; then
- echo "Creating $OUTDIR/"
- mkdir -p $OUTDIR
-fi
-
-if test ! -d $OUTDIR; then
- echo "Unable to create $OUTDIR/" 1>&2
- exit 2
-fi
-
-# Now start the logging.
-echo "Starting logging"
-HOSTNAME=`hostname`
-if test -f "$libdir/Orca_Services.$HOSTNAME"; then
- $libdir/Orca_Services `cat $libdir/Orca_Services.$HOSTNAME`
-else
- $libdir/Orca_Services
-fi
-
-### # Write the PID of Orca_Services to a file to make killing easier.
-### pid=$!
-### echo $pid > $OUTDIR/Orca_Services.pid
-
-# Sleep for a couple of seconds to allow any Orca_Services warnings to appear.
-sleep 5
More information about the Orca-checkins
mailing list