From cf3cd9e9a73dc1bfe8c63afd3ff28e66a8308f39 Mon Sep 17 00:00:00 2001 From: Jordi Sanfeliu Date: Fri, 21 Feb 2020 10:36:35 +0100 Subject: [PATCH] closing 3.12.0 --- README | 9 +++------ docs/monitorix.spec | 3 ++- lib/Monitorix.pm | 2 +- lib/ambsens.pm | 2 +- lib/apache.pm | 2 +- lib/apcupsd.pm | 2 +- lib/bind.pm | 2 +- lib/chrony.pm | 2 +- lib/disk.pm | 2 +- lib/du.pm | 2 +- lib/fail2ban.pm | 2 +- lib/fs.pm | 2 +- lib/ftp.pm | 2 +- lib/gensens.pm | 2 +- lib/hptemp.pm | 2 +- lib/icecast.pm | 2 +- lib/int.pm | 2 +- lib/ipmi.pm | 2 +- lib/kern.pm | 2 +- lib/libvirt.pm | 2 +- lib/lighttpd.pm | 2 +- lib/lmsens.pm | 2 +- lib/mail.pm | 2 +- lib/memcached.pm | 2 +- lib/mongodb.pm | 2 +- lib/mysql.pm | 2 +- lib/net.pm | 2 +- lib/netstat.pm | 2 +- lib/nfsc.pm | 2 +- lib/nfss.pm | 2 +- lib/nginx.pm | 2 +- lib/ntp.pm | 2 +- lib/nut.pm | 2 +- lib/nvidia.pm | 2 +- lib/pagespeed.pm | 2 +- lib/phpapc.pm | 2 +- lib/phpfpm.pm | 2 +- lib/port.pm | 2 +- lib/proc.pm | 2 +- lib/process.pm | 2 +- lib/raspberrypi.pm | 2 +- lib/serv.pm | 2 +- lib/squid.pm | 2 +- lib/system.pm | 2 +- lib/tc.pm | 2 +- lib/traffacct.pm | 2 +- lib/unbound.pm | 2 +- lib/user.pm | 2 +- lib/varnish.pm | 2 +- lib/verlihub.pm | 2 +- lib/wowza.pm | 2 +- lib/zfs.pm | 2 +- man/man5/monitorix.conf.5 | 6 +++--- man/man8/monitorix.8 | 6 +++--- monitorix | 10 +++++----- monitorix.cgi | 6 +++--- 56 files changed, 69 insertions(+), 71 deletions(-) diff --git a/README b/README index 7dec4ee..bed0e00 100644 --- a/README +++ b/README @@ -79,16 +79,13 @@ distribution may or may not have: - Perl-MIME-Lite - Perl-DBI - Perl-XML-Simple +- Perl-XML-LibXML - Perl-Config-General - Perl-HTTP-Server-Simple - perl-IO-Socket-SSL - RRDtool and its Perl bindings (perl-rrdtool or rrdtool-perl) - (Optional) a CGI capable Web server (Apache, Nginx, lighttpd, etc.) -You can download RRDtool from different places: - http://pkgs.repoforge.org/rrdtool/ - http://oss.oetiker.ch/rrdtool/ - INSTALLATION =============================================================================== @@ -191,6 +188,6 @@ LICENSE AND COPYRIGHT Monitorix is distributed under the terms of the GNU General Public License. See the included file "COPYING". -Copyright (C) 2005-2019 Jordi Sanfeliu. -http://www.monitorix.org +Copyright (C) 2005-2020 Jordi Sanfeliu. +https://www.monitorix.org diff --git a/docs/monitorix.spec b/docs/monitorix.spec index f8cf9ca..51dc59e 100644 --- a/docs/monitorix.spec +++ b/docs/monitorix.spec @@ -3,7 +3,7 @@ Summary: Monitorix is a system monitoring tool Name: monitorix -Version: 3.11.0 +Version: 3.12.0 Release: 1%{?dist} License: GPL Group: Applications/System @@ -21,6 +21,7 @@ Requires: perl-MailTools Requires: perl-MIME-Lite Requires: perl-DBI Requires: perl-XML-Simple +Requires: perl-XML-LibXML Requires: perl-Config-General Requires: perl-HTTP-Server-Simple Requires: perl-IO-Socket-SSL diff --git a/lib/Monitorix.pm b/lib/Monitorix.pm index d9d2a14..52e3c0a 100644 --- a/lib/Monitorix.pm +++ b/lib/Monitorix.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/ambsens.pm b/lib/ambsens.pm index f93afe4..63ee96b 100644 --- a/lib/ambsens.pm +++ b/lib/ambsens.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/apache.pm b/lib/apache.pm index b4c22e5..97f91bb 100644 --- a/lib/apache.pm +++ b/lib/apache.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/apcupsd.pm b/lib/apcupsd.pm index 4ba5d13..992f60b 100644 --- a/lib/apcupsd.pm +++ b/lib/apcupsd.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/bind.pm b/lib/bind.pm index 69423d1..854e18a 100644 --- a/lib/bind.pm +++ b/lib/bind.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/chrony.pm b/lib/chrony.pm index 0e66de8..e34f8dd 100644 --- a/lib/chrony.pm +++ b/lib/chrony.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/disk.pm b/lib/disk.pm index de98531..674a34c 100644 --- a/lib/disk.pm +++ b/lib/disk.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/du.pm b/lib/du.pm index f10baa2..fb21894 100644 --- a/lib/du.pm +++ b/lib/du.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/fail2ban.pm b/lib/fail2ban.pm index aa43e6b..21b5d49 100644 --- a/lib/fail2ban.pm +++ b/lib/fail2ban.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/fs.pm b/lib/fs.pm index ff6fc5b..5e29081 100644 --- a/lib/fs.pm +++ b/lib/fs.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/ftp.pm b/lib/ftp.pm index a1a1343..09c3f27 100644 --- a/lib/ftp.pm +++ b/lib/ftp.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/gensens.pm b/lib/gensens.pm index 1af3817..4d64384 100644 --- a/lib/gensens.pm +++ b/lib/gensens.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/hptemp.pm b/lib/hptemp.pm index 2bdfa28..013ee72 100644 --- a/lib/hptemp.pm +++ b/lib/hptemp.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/icecast.pm b/lib/icecast.pm index 6b40668..702d1f3 100644 --- a/lib/icecast.pm +++ b/lib/icecast.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/int.pm b/lib/int.pm index 6110794..53648da 100644 --- a/lib/int.pm +++ b/lib/int.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/ipmi.pm b/lib/ipmi.pm index 9af76b9..6598fe2 100644 --- a/lib/ipmi.pm +++ b/lib/ipmi.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/kern.pm b/lib/kern.pm index d205341..d71f80d 100644 --- a/lib/kern.pm +++ b/lib/kern.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/libvirt.pm b/lib/libvirt.pm index c4fc661..65b4013 100644 --- a/lib/libvirt.pm +++ b/lib/libvirt.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/lighttpd.pm b/lib/lighttpd.pm index 876893f..e951740 100644 --- a/lib/lighttpd.pm +++ b/lib/lighttpd.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/lmsens.pm b/lib/lmsens.pm index 2d80011..127a349 100644 --- a/lib/lmsens.pm +++ b/lib/lmsens.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/mail.pm b/lib/mail.pm index 9f418b3..4c2033e 100644 --- a/lib/mail.pm +++ b/lib/mail.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/memcached.pm b/lib/memcached.pm index e30d7f1..b3275d3 100644 --- a/lib/memcached.pm +++ b/lib/memcached.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/mongodb.pm b/lib/mongodb.pm index eb11375..dcf3b03 100644 --- a/lib/mongodb.pm +++ b/lib/mongodb.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/mysql.pm b/lib/mysql.pm index 26ad3e4..97460b9 100644 --- a/lib/mysql.pm +++ b/lib/mysql.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/net.pm b/lib/net.pm index ebf16a4..ade958d 100644 --- a/lib/net.pm +++ b/lib/net.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/netstat.pm b/lib/netstat.pm index 9e8c935..beca12e 100644 --- a/lib/netstat.pm +++ b/lib/netstat.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/nfsc.pm b/lib/nfsc.pm index 75d86ba..0bd2a60 100644 --- a/lib/nfsc.pm +++ b/lib/nfsc.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/nfss.pm b/lib/nfss.pm index 103c236..4590507 100644 --- a/lib/nfss.pm +++ b/lib/nfss.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/nginx.pm b/lib/nginx.pm index 6bd8cce..19f2d09 100644 --- a/lib/nginx.pm +++ b/lib/nginx.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/ntp.pm b/lib/ntp.pm index 4463b13..6f5817a 100644 --- a/lib/ntp.pm +++ b/lib/ntp.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/nut.pm b/lib/nut.pm index bdebdec..6aa33d8 100644 --- a/lib/nut.pm +++ b/lib/nut.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/nvidia.pm b/lib/nvidia.pm index e4b1db7..8564c82 100644 --- a/lib/nvidia.pm +++ b/lib/nvidia.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/pagespeed.pm b/lib/pagespeed.pm index 85cf676..b98c18b 100644 --- a/lib/pagespeed.pm +++ b/lib/pagespeed.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/phpapc.pm b/lib/phpapc.pm index e40fb0a..5d828a5 100644 --- a/lib/phpapc.pm +++ b/lib/phpapc.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/phpfpm.pm b/lib/phpfpm.pm index 51d21de..cf9809d 100644 --- a/lib/phpfpm.pm +++ b/lib/phpfpm.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/port.pm b/lib/port.pm index 33663d6..b0c57c5 100644 --- a/lib/port.pm +++ b/lib/port.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/proc.pm b/lib/proc.pm index da6c48b..9f53574 100644 --- a/lib/proc.pm +++ b/lib/proc.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/process.pm b/lib/process.pm index 9317a29..30337df 100644 --- a/lib/process.pm +++ b/lib/process.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/raspberrypi.pm b/lib/raspberrypi.pm index d6008a1..ab0f9d0 100644 --- a/lib/raspberrypi.pm +++ b/lib/raspberrypi.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/serv.pm b/lib/serv.pm index 7b4a7c1..ebe2a78 100644 --- a/lib/serv.pm +++ b/lib/serv.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/squid.pm b/lib/squid.pm index 2596b93..7ccbcd8 100644 --- a/lib/squid.pm +++ b/lib/squid.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/system.pm b/lib/system.pm index cc69676..9dfc4cf 100644 --- a/lib/system.pm +++ b/lib/system.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/tc.pm b/lib/tc.pm index 4ae5750..f9cc5ee 100644 --- a/lib/tc.pm +++ b/lib/tc.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/traffacct.pm b/lib/traffacct.pm index 4cf8914..6998e60 100644 --- a/lib/traffacct.pm +++ b/lib/traffacct.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/unbound.pm b/lib/unbound.pm index 83a5cb9..7469652 100644 --- a/lib/unbound.pm +++ b/lib/unbound.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/user.pm b/lib/user.pm index 5de25c6..32223cc 100644 --- a/lib/user.pm +++ b/lib/user.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/varnish.pm b/lib/varnish.pm index c53e008..6359639 100644 --- a/lib/varnish.pm +++ b/lib/varnish.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/verlihub.pm b/lib/verlihub.pm index f4005ed..b8c5c74 100644 --- a/lib/verlihub.pm +++ b/lib/verlihub.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/wowza.pm b/lib/wowza.pm index f688976..0fcb773 100644 --- a/lib/wowza.pm +++ b/lib/wowza.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/zfs.pm b/lib/zfs.pm index 6bdf513..ee880d2 100644 --- a/lib/zfs.pm +++ b/lib/zfs.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/man/man5/monitorix.conf.5 b/man/man5/monitorix.conf.5 index 12065f4..85c95f6 100644 --- a/man/man5/monitorix.conf.5 +++ b/man/man5/monitorix.conf.5 @@ -1,9 +1,9 @@ .\" Monitorix manpage. -.\" Copyright (C) 2005-2019 by Jordi Sanfeliu +.\" Copyright (C) 2005-2020 by Jordi Sanfeliu .\" .\" This is the man page for the monitorix.conf configuration file. .\" -.TH monitorix.conf 5 "Mar 2019" 3.11.0 "Monitorix configuration file" +.TH monitorix.conf 5 "Feb 2020" 3.12.0 "Monitorix configuration file" .SH NAME monitorix.conf \- Configuration file for Monitorix. .SH DESCRIPTION @@ -3246,7 +3246,7 @@ This is where you can enter the upper-limit and lower-limit values (separated by .SH AUTHOR Monitorix is written by Jordi Sanfeliu .SH COPYRIGHT -Copyright \(co 2005-2019 Jordi Sanfeliu +Copyright \(co 2005-2020 Jordi Sanfeliu .br Licensed under the GNU General Public License version 2 (GPLv2). .SH SEE ALSO diff --git a/man/man8/monitorix.8 b/man/man8/monitorix.8 index a1ce76f..1d16048 100644 --- a/man/man8/monitorix.8 +++ b/man/man8/monitorix.8 @@ -1,9 +1,9 @@ .\" Monitorix manpage. -.\" Copyright (C) 2005-2019 by Jordi Sanfeliu +.\" Copyright (C) 2005-2020 by Jordi Sanfeliu .\" .\" This is the man page for the monitorix collector daemon. .\" -.TH monitorix 8 "Mar 2019" 3.11.0 "Monitorix collector daemon" +.TH monitorix 8 "Feb 2020" 3.12.0 "Monitorix collector daemon" .SH NAME monitorix - a lightweight system monitoring tool .SH SYNOPSIS @@ -54,7 +54,7 @@ HTML main page. .SH AUTHOR Monitorix is written by Jordi Sanfeliu .SH COPYRIGHT -Copyright \(co 2005-2019 Jordi Sanfeliu +Copyright \(co 2005-2020 Jordi Sanfeliu .br Licensed under the GNU General Public License version 2 (GPLv2). .SH "SEE ALSO" diff --git a/monitorix b/monitorix index 7efc2dc..cb1cd23 100755 --- a/monitorix +++ b/monitorix @@ -2,7 +2,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -44,8 +44,8 @@ $SIG{'STOP'} = 'INT_handler'; $SIG{'TERM'} = 'INT_handler'; $SIG{'HUP' } = 'HUP_handler'; -use constant VERSION => "3.11.0"; -use constant RELDATE => "14-Mar-2019"; +use constant VERSION => "3.12.0"; +use constant RELDATE => "21-Feb-2020"; my @suppsys = ("Linux", "FreeBSD", "OpenBSD", "NetBSD"); our %config; @@ -498,7 +498,7 @@ getopts("c:p:d:vn", \%options) || usage(); if($options{v}) { print("Monitorix version " . VERSION . " (" . RELDATE . ")\n"); print("by Jordi Sanfeliu \n"); - print("http://www.monitorix.org/\n\n"); + print("https://www.monitorix.org/\n\n"); exit(0); } if(!$options{c}) { @@ -642,7 +642,7 @@ if(!$config{image_format}) { } if(!defined($config{logo_top_url})) { logger("WARNING: the 'logo_top_url' option doesn't exist. Please consider upgrading your configuration file."); - $config{logo_top_url} = "http://www.monitorix.org/"; + $config{logo_top_url} = "https://www.monitorix.org/"; } if(lc($config{httpd_builtin}->{enabled} || "") eq "y" && !$config{httpd_builtin}->{autocheck_responsiveness}) { logger("WARNING: the 'autocheck_responsiveness' option is not valid or doesn't exist. Please consider upgrading your configuration file."); diff --git a/monitorix.cgi b/monitorix.cgi index 11a6ea2..329660a 100755 --- a/monitorix.cgi +++ b/monitorix.cgi @@ -2,7 +2,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2019 by Jordi Sanfeliu +# Copyright (C) 2005-2020 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -679,10 +679,10 @@ if(!$silent) { print(" \n"); print("\n"); print("

\n"); - print(" \n"); + print(" \n"); print("
\n"); print(" \n"); - print("Copyright © 2005-2019 Jordi Sanfeliu\n"); + print("Copyright © 2005-2020 Jordi Sanfeliu\n"); print(" \n"); } print(" \n");