aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2020-09-19 21:24:38 +0300
committerSergey Poznyakoff <gray@gnu.org>2020-09-19 21:24:38 +0300
commit6c0b1a6431540c074920252a3b2a964fe9bdf99b (patch)
tree5c238a011e96674430120259b969cddd1eab09d3
parenta9974c3f5be1077909849151c14d01f5eed86576 (diff)
downloadping903-master.tar.gz
ping903-master.tar.bz2
Proof-read the docs.HEADmaster
-rw-r--r--README32
-rw-r--r--doc/ping903.819
-rw-r--r--doc/ping903.conf.524
-rw-r--r--doc/ping903.cred.58
-rw-r--r--doc/ping903q.115
-rwxr-xr-xexamples/dbload2
-rw-r--r--rc/README6
7 files changed, 53 insertions, 53 deletions
diff --git a/README b/README
index 94ec8d9..7de1140 100644
--- a/README
+++ b/README
@@ -48,7 +48,7 @@ discussion of available options to configure and their effect.
After installing the package, copy the file src/ping903.conf to
/etc/ping903.conf and edit it to your liking. This file contains
configuration settings that control the behavior of the server daemon
-and, to a certain extent, that of a query tool. The file contains
+and, to a certain extent, that of the query tool. The file contains
short annotations before each statement to help you navigate through
it. You will find a detailed discussion of the configuration file in
the manpage ping903.conf(5). What follows is a short outline, intended
@@ -86,9 +86,9 @@ of them in a separate ip-list statement.
IP addresses listed in ip-list files form the "immutable" IP list,
called so because it cannot be altered while the program is running.
The REST API allows the user to add any number of IP addresses at
-runtime as well as remove any of IP addresses added this way. These
-addresses form the "mutable" IP list. Mutable IP list is preserved
-across program restarts.
+runtime as well as to remove any of IP addresses added this way.
+These addresses form the "mutable" IP list. Mutable IP list is
+preserved across program restarts.
This means that actually the immutable IP list is optional. You may
choose to keep monitored addresses in an external storage (an SQL
@@ -102,8 +102,8 @@ from <http://git.gnu.org.ua/cgit/ping903/mangemanche.git>.
Normally, the ip-list file should contain IP addresses of the hosts to
monitor. It is OK, however, to use symbolic DNS names, too. If a
hostname resolves to a single A record, such usage is equivalent to
-placing that IP in the ip-list. However, if the hostnames resolves to
-multiple IPs, only first one will be used.
+placing that IP in the ip-list. However, if it resolves to multiple IPs,
+only the first one will be used.
By default, the server will wake up each minute and send 10 echo
requests within 1 second intervals to each registered IP. If the
@@ -148,9 +148,9 @@ operational, run
This should return the running configuration.
-Within the next 'probe-interval' seconds the server will collect
-enough statistics to answer your queries. You can request information
-about any particular IP from your ip-list by running
+Within the first 'probe-interval' seconds after startup, the daemon will
+collect enough statistics to answer your queries. You can request
+information about any particular IP from your ip-list by running
ping903q IP
@@ -181,11 +181,11 @@ Note, that depending on your settings the output can be huge.
Please refer to ping903q(1), for a detailed discussion of the tool.
-* System start-up sequence
+* Startup scripts
-To configure ping903 to start automatically at the system start-up,
-see the "rc" subdirectory. It contains start up scripts for various
-flavors of GNU/Linux distributions.
+The package includes startup scripts for several major GNU/Linux
+distributions. Please refer to rc/README for instructions on
+adding ping903 to the operating system startup and shutdown sequences.
* Nagios external check
@@ -209,12 +209,6 @@ makes use of it:
retry_interval 1
}
-* Startup scripts
-
-The package includes startup scripts for several major GNU/Linux
-distributions. Please refer to rc/README for instructions on
-adding ping903 to the operating system startup and shutdown sequences.
-
* Installation from a git clone
If you are building from a clone of the Git repository, you will need
diff --git a/doc/ping903.8 b/doc/ping903.8
index 35cbb4a..f8967af 100644
--- a/doc/ping903.8
+++ b/doc/ping903.8
@@ -13,7 +13,7 @@
.\"
.\" You should have received a copy of the GNU General Public License
.\" along with Ping903. If not, see <http://www.gnu.org/licenses/>.
-.TH PING903 8 "March 11, 2020" "PING903" "System Administration"
+.TH PING903 8 "September 19, 2020" "PING903" "System Administration"
.SH NAME
ping903 \- high-performance ICMP monitoring daemon
.SH SYNOPSIS
@@ -52,12 +52,13 @@ IP list is supplied in the configuration file and cannot be altered at
run-time. The
.I mutable
IP list, in contrast, is maintained via the REST API and thus can be
-changed while the server runs. The content of mutable IP list is
+changed when the server runs. The content of the mutable IP list is
preserved during server restarts.
.PP
-Probes for each IP from the list are initiated periodically, each
+Each
.B probe\-interval
-seconds. Each probe consists of
+seconds, the daemon wakes up and probes each IP from the list. Each
+probe consists of
.B ping\-count
ICMP ECHO requests sent with intervals of
.B ping\-interval
@@ -76,10 +77,10 @@ failure \fItolerance\fR number) are lost, the status of the IP is
changed to "inactive".
.PP
An \fBHTTP\fR listener thread is responsible for returning the collected
-statistics and serving other requests. By default the program listens
-for queries on localhost, port 8080. If compiled with the support for
-\fBlibwrap\fR, the access to the HTTP interface can be controlled
-using files
+statistics and serving other requests. By default it listens for
+queries on localhost, port 8080. If compiled with the support for
+\fBlibwrap\fR, the access to the HTTP interface is controlled using
+the files
.B /etc/hosts.allow
and
.BR /etc/hosts.deny .
@@ -146,7 +147,7 @@ requests sent and replies received. Two options (\fB\-vv\fR), enable
additional diagnostics of invalid echo replies. Three options enable
logging of each received echo reply, and four options enable verbose
logging of each echo request sent. Notice that three or more
-\fB\-v\fR options can produce huge amount of logs.
+\fB\-v\fR options can produce a huge amount of output.
.SH BUGS
Only IPv4 is currently supported.
.SH SEE ALSO
diff --git a/doc/ping903.conf.5 b/doc/ping903.conf.5
index cf3432e..a5e9cc4 100644
--- a/doc/ping903.conf.5
+++ b/doc/ping903.conf.5
@@ -13,7 +13,7 @@
.\"
.\" You should have received a copy of the GNU General Public License
.\" along with Ping903. If not, see <http://www.gnu.org/licenses/>.
-.TH PING903.CONF 5 "March 10, 2020" "PING903.CONF" "File Formats Manual"
+.TH PING903.CONF 5 "September 19, 2020" "PING903.CONF" "File Formats Manual"
.SH NAME
ping903.conf \- configuration file for high-performance ICMP monitoring daemon
.SH DESCRIPTION
@@ -67,7 +67,7 @@ through
\fBip\-list \fIFILE\fR
Name of the file supplying a list of IP addresses (or hostnames) to
monitor. Each IP must be listed on a separate line. Empty lines,
-leading and trailing whitespace is ignored. Comments are introduced
+leading and trailing whitespace are ignored. Comments are introduced
by a hash sign as the first non-whitespace character on the line.
.TP
\fBip\-list <<\fIWORD\fR
@@ -82,7 +82,7 @@ Empty lines and comments are allowed within \fIhere-document\fR.
Multiple \fBip\-list\fR statements of any form accumulate.
.TP
\fBprobe\-interval \fIN\fR
-Sets interval between subsequent probes, in seconds. Default is 60
+Sets interval (in seconds) between subsequent probes. Default is 60
(one minute).
.TP
\fBping\-count \fIN\fR
@@ -112,7 +112,7 @@ symbolic service name from
Either \fIIPADDR\fR or \fIPORT\fR (but not both) can be omitted. Missing
\fIIPADDR\fR is equivalent to 127.0.0.1 (note, that in this case the
colon before \fIPORT\fR must be present). Missing \fIPORT\fR means
-use the default port number (8080).
+the default port number (8080).
To summarize, possible arguments are:
\fIIPADDR\fB:\fIPORT\fR, \fIIPADDR\fR, or \fB:\fIPORT\fR.
@@ -127,7 +127,7 @@ backlog queue. Default is the platform-dependent value
(128 on most GNU/Linux systems).
.TP
\fBaccess\-log \fIBOOL\fR
-Enable apache-style HTTPD access logging. Valid \fIBOOL\fR values are:
+Enables the apache-style HTTP access logging. Valid \fIBOOL\fR values are:
.BR 1 ,
.BR t ,
.BR true ,
@@ -156,7 +156,7 @@ IP of the connection. If the
.B X\-Forwarded\-For
header is present, its value overrides that IP. If the
header contains a comma-delimited list of IP addresses, this list is
-processed in right-to-left order, until either a not trusted IP or the
+processed from right to left, until either a not trusted IP or the
first IP in the list is encountered, whichever occurs first.
\fICIDR\fR is either an IPv4 address, or an address followed by slash
@@ -170,8 +170,8 @@ description of \fBip\-list\fR above for the description of
single CIDR per line.
.SS HTTP Authorization configuration
It is suggested that HTTP entry points be protected by the HTTP
-authorization. This is especially critical for \fB/config\fR and
-below, which allows the requester to modify \fBping903\fR
+authorization. This is especially critical for the \fB/config\fR
+URL and URLs below it, which allow the requester to modify \fBping903\fR
configuration. This version of \fBping903\fR supports HTTP basic
authorization.
.TP
@@ -179,7 +179,7 @@ authorization.
This statement enables basic authentication for \fIURL\fR when
accessed using the given HTTP \fIMETHOD\fR.
-\fIMETHOD\fR is either one of HTTP methods (\fBGET\fR, \fBPOST\fR,
+\fIMETHOD\fR is either the name of an HTTP method (\fBGET\fR, \fBPOST\fR,
etc.) or a wildcard \fB*\fR matching any method.
\fIURL\fR is the \fBping903\fR URL. It is treated as a prefix, i.e.
@@ -203,7 +203,7 @@ double-quoted string any occurrence of a double-quote or backslash
character must be escaped by prefixing it with a backslash.
These parameters are mandatory only for the very first occurrence of the
-\fBauth\fR statements. The statements that follow it may omit the
+\fBauth\fR statement. The statements that follow it may omit the
\fIIPFILE\fR and/or \fIREALM\fR, if they are the same as in the
preceding statement. For example, the following statements protect
modifications to the \fBping903\fR configuration with basic
@@ -221,8 +221,8 @@ and \fIURL\fR.
Use this statement to exempt an URL from authorization which is
otherwise required for its parent URL. For example, the two
-statements below require basic authorization for "/config", excepting
-"/config/ip-list":
+statements below require basic authorization for "/config", but not
+for "/config/ip-list":
.sp
.nf
auth none GET /config/ip-list
diff --git a/doc/ping903.cred.5 b/doc/ping903.cred.5
index ede1b2b..2a4203b 100644
--- a/doc/ping903.cred.5
+++ b/doc/ping903.cred.5
@@ -13,7 +13,7 @@
.\"
.\" You should have received a copy of the GNU General Public License
.\" along with Ping903. If not, see <http://www.gnu.org/licenses/>.
-.TH PING903.CRED 5 "March 22, 2020" "PING903.CRED" "File Formats Manual"
+.TH PING903.CRED 5 "September 19, 2020" "PING903.CRED" "File Formats Manual"
.SH NAME
ping903.cred \- Credentials storage for ping903
.SH DESCRIPTION
@@ -44,8 +44,8 @@ Their meaning is as follows:
.I SERVER
Specifies the server to which this entry applies. It consists of the
server IP address or DNS name, optionally followed by a colon and port
-number. A wildcard character \fB*\fR can be used in place of the
-either part, in which case this part will match any IP (or port).
+number. Either part can be replaced with a wildcard character
+\fB*\fR, in which case it will match any IP (or port).
If a DNS name is used, it will be resolved.
@@ -68,7 +68,7 @@ When the server requests authorization, the client program
.B ~/.ping903.cred
file for an entry with the \fISERVER\fR matching the IP and port of
the server (as configured by the \fBlisten\fR statement in the
-\fB/etc/ping903.conf\fR file) and the \fIREALM\fR filed matching the
+\fB/etc/ping903.conf\fR file) and the \fIREALM\fR field matching the
authorization realm presented by the server. If such an entry is
found, the client will re-submit the request using the
\fIUSER\fR and \fIPASSWORD\fR for authorization.
diff --git a/doc/ping903q.1 b/doc/ping903q.1
index cf6172e..9352ca9 100644
--- a/doc/ping903q.1
+++ b/doc/ping903q.1
@@ -13,7 +13,7 @@
.\"
.\" You should have received a copy of the GNU General Public License
.\" along with Ping903. If not, see <http://www.gnu.org/licenses/>.
-.TH PING903Q 1 "March 10, 2020" "PING903Q" "User Commands"
+.TH PING903Q 1 "September 19, 2020" "PING903Q" "User Commands"
.SH NAME
ping903q \- ping903 query tool
.SH SYNOPSIS
@@ -51,8 +51,8 @@ detailed information about round trip times and lost packets.
By default, the program attempts to connect to the default REST API
port of (localhost:8080). If the file
.B /etc/ping903.conf
-exists, it will obtain the socket address from the \fBlisten\fR
-statement. See
+exists and contains the \fBlisten\fR statement, the value of this
+statement will be used instead. See
.BR ping903.conf (5),
for detailed description of the configuration file.
.SS Nagios check mode
@@ -76,7 +76,7 @@ authorization \fIrealm\fR name presented by the server. If such an
entry is found, the user name and password listed in it will be used
to send the authorized request.
.PP
-Using the \fB\-R\fR option, you can force using a specific realm for
+The \fB\-R\fR option allows you to use a specific realm for
authorization. In this case, the \fB.ping903.cred\fR file is scanned
at startup and the credentials found in it are used to authorize the
request, without sending unauthorized request first and consulting the
@@ -89,7 +89,7 @@ When called without arguments, the program exits with code 0 if all
monitored IP addresses are alive, 2 if none of them is reachable and 1
if some of them are.
.PP
-Exit codes in nagios check mode:
+In Nagios check mode, exit codes are:
.TP
.B 0
Success
@@ -167,7 +167,7 @@ arguments.
Other options valid in this mode:
.TP
\fB\-N\fR
-By default hosts in initial state (i.e. for which no data has been
+By default, hosts in initial state (i.e. for which no data has been
collected) are treated as "OK" (exit status 0). This option changes
the default to treat them as "UNKNOWN" (exit status 3).
.TP
@@ -183,7 +183,8 @@ Switch to the host match mode.
.SH SEE ALSO
.BR ping903 (8),
.BR ping903.cred (5),
-.BR Nagios <https://www.nagios.org/>.
+.B Nagios
+<https://www.nagios.org/>.
.SH COPYRIGHT
Copyright \(co 2020 Sergey Poznyakoff
.br
diff --git a/examples/dbload b/examples/dbload
index 4502d55..f59dee9 100755
--- a/examples/dbload
+++ b/examples/dbload
@@ -59,7 +59,7 @@ B<--table> and B<--column> options together. For really complex queries,
use the B<--query> option instead. See below for details.
On success, prints on standard output the number of IP addresses loaded and
-exits with status 0. On error, displays on stabdard error the detailed
+exits with status 0. On error, displays on standard error the detailed
diagnostic information as obtained from the server and exits with status 1.
=head1 OPTIONS
diff --git a/rc/README b/rc/README
index 40e716e..e3abc05 100644
--- a/rc/README
+++ b/rc/README
@@ -1,10 +1,12 @@
* Overview
+
This directory contains distribution-specific startup scripts for
Ping903. All scripts assume the daemon binary is installed at
/usr/sbin/ping903. If it's not the case, change the value of the
COMMAND variable, located at the start of the script.
* debian.rc
+
The start script for Debian-based systems without systemd. Use it on
Debian 7, Ubuntu up to 16.04, etc.
@@ -17,7 +19,7 @@ Debian 7, Ubuntu up to 16.04, etc.
update-rc.d ping903 defaults
-Optionally, you may create the file /etc/default/903, which can
+Optionally, you may create the file /etc/default/ping903, which can
define two shell variables:
START
@@ -28,6 +30,7 @@ define two shell variables:
Additional options to be passed to the server.
* ping903.service
+
Service definition for systems with systemd. Usage:
1. Copy
@@ -43,6 +46,7 @@ Service definition for systems with systemd. Usage:
systemctl start ping903
* slackware.rc
+
Slackware rc script. In fact, it is the most general of all and it
will work an all systems with no (or at a pinch, little) changes.
Usage:

Return to:

Send suggestions and report system problems to the System administrator.