From 93c2dd68656b3304218d6614ab035a2932013d67 Mon Sep 17 00:00:00 2001 From: Jordi Sanfeliu Date: Mon, 18 Feb 2013 15:31:11 +0100 Subject: [PATCH] last updates on 3.0.0 --- Changes | 2 +- README | 12 +++++------- man/man5/monitorix.conf.5 | 10 +++++----- man/man8/monitorix.8 | 4 ++-- monitorix | 4 ++-- 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/Changes b/Changes index fc4c770..9de0126 100644 --- a/Changes +++ b/Changes @@ -1,4 +1,4 @@ -3.0.0RC- NN-Feb-2013 +3.0.0 - 18-Feb-2013 ==================== - Added an HTTP built-in server. - Changed the path 'cgi-bin' to 'cgi'. diff --git a/README b/README index 463b52e..878d3c9 100644 --- a/README +++ b/README @@ -2,13 +2,13 @@ INTRODUCTION =============================================================================== Monitorix is a free, open source, lightweight system monitoring tool designed to monitor as many services and system resources as possible. It has been -created to be used under production UNIX/Linux servers, but due to its +created to be used under production Linux/UNIX servers, but due to its simplicity and small size may also be used to monitor embedded devices as well. It consists mainly of two programs: a collector, called monitorix, which is a Perl daemon that is started automatically like any other system service, -and a CGI script called monitorix.cgi. +and a CGI script called monitorix.cgi. Since 3.0 version Monitorix includes its own HTTP server built in, so you don't need to install any web server to use it. Every time 'monitorix' is started it reads the configuration file from the path specified in the command line (using the -c option), and once checked, it @@ -17,9 +17,6 @@ creates the 'index.html' file that will act as the Monitorix main page. It also creates a file called '/cgi/monitorix.conf.path' that includes the absolute path of the configuration file. This file will be read by 'monitorix.cgi' to determine the exact location of the configuration file. -If for any reason it is unable to locate this file, Monitorix will try two -alternative locations: '/etc/monitorix.conf' and -'/usr/local/etc/monitorix.conf'. Please, see the monitorix.conf(5) and monitorix(8) man pages. @@ -54,8 +51,8 @@ Since the release 2.6.0 Monitorix includes support for NetBSD systems. With the release of the 3.0.0 version, Monitorix suffered another large rewrite which became into a complete modular code structure reducing in some cases -its memory footprint. That new version also included a number of new features -and graphs, cleaned up all the code, fixed a lot of bugs and had a safest code +its memory footprint. That new version also included a number of new features, +cleaned up all the code, fixed a lot of bugs and had a safest code as it used 'strict' and 'warnings' in all its modules. With this new modular structure, Monitorix can now be packaged either into a @@ -82,6 +79,7 @@ distribution may or may not have: - Perl-DBI - Perl-XML-Simple - Perl-Config-General +- Perl-HTTP-Server-Simple - RRDtool and its Perl bindings (perl-rrdtool or rrdtool-perl) - (Optional) a CGI capable Web server (Apache, Nginx, lighttpd, etc.) diff --git a/man/man5/monitorix.conf.5 b/man/man5/monitorix.conf.5 index e85366e..4a33241 100644 --- a/man/man5/monitorix.conf.5 +++ b/man/man5/monitorix.conf.5 @@ -3,17 +3,17 @@ .\" .\" This is the man page for the monitorix.conf configuration file. .\" -.TH monitorix.conf 5 "Feb 2013" 3.0.0beta2 "Monitorix configuration file" +.TH monitorix.conf 5 "Feb 2013" 3.0.0 "Monitorix configuration file" .SH NAME monitorix.conf \- Configuration file for Monitorix. .SH DESCRIPTION -Monitorix is a free, open source, lightweight system monitoring tool designed to monitor as many services and system resources as possible. It has been created to be used on production UNIX/Linux servers, but due to its simplicity and small size may also be used to monitor embedded devices as well. +Monitorix is a free, open source, lightweight system monitoring tool designed to monitor as many services and system resources as possible. It has been created to be used on production Linux/UNIX servers, but due to its simplicity and small size may also be used to monitor embedded devices as well. .P -It consists mainly of two programs: a collector, called \fBmonitorix\fP, which is a Perl daemon that is started automatically like any other system service, and a CGI script called \fBmonitorix.cgi\fP. +It consists mainly of two programs: a collector, called \fBmonitorix\fP, which is a Perl daemon that is started automatically like any other system service, and a CGI script called \fBmonitorix.cgi\fP. Since 3.0 version Monitorix includes its own HTTP server built in, so you don't need to install any web server to use it. .P Every time \fBmonitorix\fP is started it reads the configuration file from the path specified in the command line (using the \fB-c\fP option), and once checked, it creates the \fIindex.html\fP file that will act as the Monitorix main page. .P -It also creates a file called \fI/cgi/monitorix.conf.path\fP that includes the absolute path of the configuration file. This file will be read by \fBmonitorix.cgi\fP to determine the exact location of the configuration file. If for any reason it is unable to locate this file, Monitorix will try two alternate locations: \fI/etc/monitorix.conf\fP and \fI/usr/local/etc/monitorix.conf\fP. +It also creates a file called \fI/cgi/monitorix.conf.path\fP that includes the absolute path of the configuration file. This file will be read by \fBmonitorix.cgi\fP to determine the exact location of the configuration file. .SH CONFIGURATION OPTIONS Blank lines are ignored, and whitespace before and after a token or value is ignored as well as tabulators, although a value can contain whitespace within. Lines which begin with a # are considered comments and ignored. .P @@ -1539,7 +1539,7 @@ Monitorix is written by Jordi Sanfeliu .SH COPYRIGHT Copyright \(co 2005-2013 Jordi Sanfeliu .br -Licensed under the GNU General Public License v2 (GPL). +Licensed under the GNU General Public License version 2 (GPLv2). .SH SEE ALSO .BR monitorix (8), .BR rrdtool (1) diff --git a/man/man8/monitorix.8 b/man/man8/monitorix.8 index 54a56a8..2afe0f4 100644 --- a/man/man8/monitorix.8 +++ b/man/man8/monitorix.8 @@ -3,7 +3,7 @@ .\" .\" This is the man page for the monitorix collector daemon. .\" -.TH monitorix 8 "Feb 2013" 3.0.0beta2 "Monitorix collector daemon" +.TH monitorix 8 "Feb 2013" 3.0.0 "Monitorix collector daemon" .SH NAME monitorix - a lightweight system monitoring tool .SH SYNOPSIS @@ -52,6 +52,6 @@ Monitorix is written by Jordi Sanfeliu .SH COPYRIGHT Copyright \(co 2005-2013 Jordi Sanfeliu .br -Licensed under the GNU General Public License v2 (GPL). +Licensed under the GNU General Public License version 2 (GPLv2). .SH "SEE ALSO" .BR monitorix.conf (5) diff --git a/monitorix b/monitorix index 3ffb9c5..9104a73 100755 --- a/monitorix +++ b/monitorix @@ -47,8 +47,8 @@ $SIG{'CHLD'} = 'CHLD_handler'; $SIG{'HUP' } = 'HUP_handler'; $SIG{'ALRM'} = 'ALRM_handler'; -use constant VERSION => "3.0.0beta3"; -use constant RELDATE => "15-Feb-2013"; +use constant VERSION => "3.0.0"; +use constant RELDATE => "18-Feb-2013"; my @suppsys = ("Linux", "FreeBSD", "OpenBSD", "NetBSD"); our %config;