mirror of https://github.com/mikaku/Monitorix.git
Compare commits
3 Commits
1a56eff83b
...
ffaa2b4d00
Author | SHA1 | Date |
---|---|---|
Jordi Sanfeliu | ffaa2b4d00 | |
Jordi Sanfeliu | e597eec86e | |
Jordi Sanfeliu | bba651d270 |
10
Changes
10
Changes
|
@ -1,3 +1,13 @@
|
|||
3.16.0 - DD-MMM-2023
|
||||
====================
|
||||
- Added support for MongoDB version 6 and changed the way how 'mongodb.pm' is
|
||||
configured. [#451]
|
||||
- Added the new option 'log_successful_requests' in the HTTP built-in server, to
|
||||
be able to not logging successful requests (enabled by default). [#454]
|
||||
- Fixed the colors based on the meaning of input (upload) and output (download)
|
||||
from the server point of view in 'ftp.pm'.
|
||||
|
||||
|
||||
3.15.0 - 07-Dec-2022
|
||||
====================
|
||||
- Added a complete graph to monitor the power consumption of Intel-RAPL capable
|
||||
|
|
52
lib/ftp.pm
52
lib/ftp.pm
|
@ -184,13 +184,13 @@ sub ftp_update {
|
|||
if($cmd eq "RETR") {
|
||||
if($code =~ /^2../) {
|
||||
$retr++;
|
||||
$bytes_down += int($bytes);
|
||||
$bytes_up += int($bytes);
|
||||
}
|
||||
}
|
||||
if($cmd =~ /(STOR|STOU)/) {
|
||||
if($code =~ /^2../) {
|
||||
$stor++;
|
||||
$bytes_up += int($bytes);
|
||||
$bytes_down += int($bytes);
|
||||
}
|
||||
}
|
||||
if($cmd =~ /(MKD|XMKD)/) {
|
||||
|
@ -222,11 +222,11 @@ sub ftp_update {
|
|||
if(/^$date /) {
|
||||
if(/ OK DOWNLOAD: .*?, (\d+) bytes, /) {
|
||||
$retr++;
|
||||
$bytes_down += int($1);
|
||||
$bytes_up += int($1);
|
||||
}
|
||||
if(/ OK UPLOAD: .*?, (\d+) bytes, /) {
|
||||
$stor++;
|
||||
$bytes_up += int($1);
|
||||
$bytes_down += int($1);
|
||||
}
|
||||
if(/ OK MKDIR: /) {
|
||||
$mkd++;
|
||||
|
@ -256,11 +256,11 @@ sub ftp_update {
|
|||
if(/^$date /) {
|
||||
if(/ \[NOTICE\] .*? downloaded \((\d+) bytes,.*?/) {
|
||||
$retr++;
|
||||
$bytes_down += int($1);
|
||||
$bytes_up += int($1);
|
||||
}
|
||||
if(/ \[NOTICE\] .*? uploaded \((\d+) bytes,.*?/) {
|
||||
$stor++;
|
||||
$bytes_up += int($1);
|
||||
$bytes_down += int($1);
|
||||
}
|
||||
if(/ \[DEBUG\] Command \[mkd\] /) {
|
||||
$mkd++;
|
||||
|
@ -432,16 +432,16 @@ sub ftp_cgi {
|
|||
push(@output, " <tr>\n");
|
||||
push(@output, " <td>\n");
|
||||
}
|
||||
push(@tmp, "LINE2:retr#44EE44:Files downloaded (RETR)");
|
||||
push(@tmp, "GPRINT:retr:LAST: Current\\: %3.0lf");
|
||||
push(@tmp, "GPRINT:retr:AVERAGE: Average\\: %3.0lf");
|
||||
push(@tmp, "GPRINT:retr:MIN: Min\\: %3.0lf");
|
||||
push(@tmp, "GPRINT:retr:MAX: Max\\: %3.0lf\\n");
|
||||
push(@tmp, "LINE2:stor#4444EE:Files uploaded (STOR)");
|
||||
push(@tmp, "LINE2:stor#44EE44:Files uploaded (STOR)");
|
||||
push(@tmp, "GPRINT:stor:LAST: Current\\: %3.0lf");
|
||||
push(@tmp, "GPRINT:stor:AVERAGE: Average\\: %3.0lf");
|
||||
push(@tmp, "GPRINT:stor:MIN: Min\\: %3.0lf");
|
||||
push(@tmp, "GPRINT:stor:MAX: Max\\: %3.0lf\\n");
|
||||
push(@tmp, "LINE2:retr#4444EE:Files downloaded (RETR)");
|
||||
push(@tmp, "GPRINT:retr:LAST: Current\\: %3.0lf");
|
||||
push(@tmp, "GPRINT:retr:AVERAGE: Average\\: %3.0lf");
|
||||
push(@tmp, "GPRINT:retr:MIN: Min\\: %3.0lf");
|
||||
push(@tmp, "GPRINT:retr:MAX: Max\\: %3.0lf\\n");
|
||||
push(@tmp, "LINE2:mkd#EEEE44:Dirs created (MKD)");
|
||||
push(@tmp, "GPRINT:mkd:LAST: Current\\: %3.0lf");
|
||||
push(@tmp, "GPRINT:mkd:AVERAGE: Average\\: %3.0lf");
|
||||
|
@ -462,8 +462,8 @@ sub ftp_cgi {
|
|||
push(@tmp, "GPRINT:mlsd:AVERAGE: Average\\: %3.0lf");
|
||||
push(@tmp, "GPRINT:mlsd:MIN: Min\\: %3.0lf");
|
||||
push(@tmp, "GPRINT:mlsd:MAX: Max\\: %3.0lf\\n");
|
||||
push(@tmpz, "LINE2:retr#44EE44:Files downloaded (RETR)");
|
||||
push(@tmpz, "LINE2:stor#4444EE:Files uploaded (STOR)");
|
||||
push(@tmpz, "LINE2:stor#44EE44:Files uploaded (STOR)");
|
||||
push(@tmpz, "LINE2:retr#4444EE:Files downloaded (RETR)");
|
||||
push(@tmpz, "LINE2:mkd#EEEE44:Dirs created (MKD)");
|
||||
push(@tmpz, "LINE2:rmd#EE4444:Dirs deleted (RMD)");
|
||||
push(@tmpz, "LINE2:dele#EE44EE:Files deleted (DELE)");
|
||||
|
@ -657,18 +657,18 @@ sub ftp_cgi {
|
|||
undef(@tmp);
|
||||
undef(@tmpz);
|
||||
undef(@CDEF);
|
||||
push(@tmp, "AREA:B_up#44EE44:Upload");
|
||||
push(@tmp, "AREA:B_dn#4444EE:Download");
|
||||
push(@tmp, "AREA:B_dn#4444EE:");
|
||||
push(@tmp, "AREA:B_up#44EE44:");
|
||||
push(@tmp, "LINE1:B_dn#0000EE");
|
||||
push(@tmp, "LINE1:B_up#00EE00");
|
||||
push(@tmpz, "AREA:B_up#44EE44:Upload");
|
||||
push(@tmpz, "AREA:B_dn#4444EE:Download");
|
||||
push(@tmpz, "AREA:B_dn#4444EE:");
|
||||
push(@tmpz, "AREA:B_up#44EE44:");
|
||||
push(@tmpz, "LINE1:B_dn#0000EE");
|
||||
push(@tmpz, "LINE1:B_up#00EE00");
|
||||
push(@tmp, "AREA:B_dn#44EE44:Input");
|
||||
push(@tmp, "AREA:B_up#4444EE:Output");
|
||||
push(@tmp, "AREA:B_up#4444EE:");
|
||||
push(@tmp, "AREA:B_dn#44EE44:");
|
||||
push(@tmp, "LINE1:B_up#0000EE");
|
||||
push(@tmp, "LINE1:B_dn#00EE00");
|
||||
push(@tmpz, "AREA:B_dn#44EE44:Input");
|
||||
push(@tmpz, "AREA:B_up#4444EE:Output");
|
||||
push(@tmpz, "AREA:B_up#4444EE:");
|
||||
push(@tmpz, "AREA:B_dn#44EE44:");
|
||||
push(@tmpz, "LINE1:B_up#0000EE");
|
||||
push(@tmpz, "LINE1:B_dn#00EE00");
|
||||
push(@CDEF, "CDEF:B_up=up");
|
||||
if(lc($config->{netstats_mode} || "") eq "separated") {
|
||||
push(@CDEF, "CDEF:B_dn=dn,-1,*");
|
||||
|
|
|
@ -259,6 +259,11 @@ sub serv_update {
|
|||
$sc[3] = "\".\"" unless $sc[3] ne "\"\""; # set "." as a minimal regex
|
||||
my @regex = split('\+', $sc[3]);
|
||||
my $IN;
|
||||
|
||||
# FIXME
|
||||
# $seek_pos does not distinguish between different
|
||||
# logfiles when a service is defined multiple times.
|
||||
|
||||
my $seek_pos = $config->{serv_hist}->{$seek_str} || 0;
|
||||
if($logfile =~ m/^file:.+/) {
|
||||
$logfile =~ s/^file://;
|
||||
|
|
|
@ -3212,6 +3212,8 @@ You can create multiple definitions of the same service with different values, s
|
|||
.RE
|
||||
.P
|
||||
You can define as much entries as you want.
|
||||
.P
|
||||
Caveat: it does not distinguish between different logfiles when a service is defined multiple times.
|
||||
.RE
|
||||
.P
|
||||
.BI mode
|
||||
|
|
Loading…
Reference in New Issue