mirrors
/
Monitorix
mirror of https://github.com/mikaku/Monitorix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add ignore_error_output option to nut.pm 

This option, when enabled, suppresses error output from upsc.
This commit is contained in:
Andreas Bachlechner 2022-02-24 10:08:44 +01:00
parent d3f2558352
commit 780e067604
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/nut.pm
View File

@ -148,6 +148,7 @@ sub nut_update {
my $rrdata = "N"; my $rrdata = "N";
my $use_nan_for_missing_data = lc($nut->{use_nan_for_missing_data} || "") eq "y" ? 1 : 0; my $use_nan_for_missing_data = lc($nut->{use_nan_for_missing_data} || "") eq "y" ? 1 : 0;
my $ignore_error_output = lc($nut->{ignore_error_output} || "") eq "y" ? 1 : 0;
my $e = 0; my $e = 0;
foreach my $ups (my @nl = split(',', $nut->{list})) { foreach my $ups (my @nl = split(',', $nut->{list})) {
@ -176,7 +177,11 @@ sub nut_update {
my $val05 = $default_value; my $val05 = $default_value;
my $data; my $data;
if(open(PIPE, "upsc $ups |")) { my $upsc_cmd = "upsc $ups";
if ($ignore_error_output) {
$upsc_cmd .= " 2>/dev/null";
}
if(open(PIPE, "$upsc_cmd |")) {
while(<PIPE>) { $data .= $_; } while(<PIPE>) { $data .= $_; }
close(PIPE); close(PIPE);
} }
@ -304,6 +309,7 @@ sub nut_cgi {
} }
my $gap_on_all_nan = lc($nut->{gap_on_all_nan} || "") eq "y" ? 1 : 0; my $gap_on_all_nan = lc($nut->{gap_on_all_nan} || "") eq "y" ? 1 : 0;
my $ignore_error_output = lc($nut->{ignore_error_output} || "") eq "y" ? 1 : 0;
# text mode # text mode
# #
@ -394,7 +400,11 @@ sub nut_cgi {
foreach my $ups (my @nl = split(',', $nut->{list})) { foreach my $ups (my @nl = split(',', $nut->{list})) {
my $data; my $data;
if(open(PIPE, "upsc $ups |")) { my $upsc_cmd = "upsc $ups";
if ($ignore_error_output) {
$upsc_cmd .= " 2>/dev/null";
}
if(open(PIPE, "$upsc_cmd |")) {
while(<PIPE>) { $data .= $_; } while(<PIPE>) { $data .= $_; }
close(PIPE); close(PIPE);
} }

7
man/man5/monitorix.conf.5
View File

@ -4213,6 +4213,13 @@ This option, when enabled via \fIy\fP, combined with the \fIshow_gaps\fP option
.P .P
Default value: \fIn\fP Default value: \fIn\fP
.RE .RE
.P
.BI ignore_error_output
.RS
This option, when enabled via \fIy\fP, suppresses error output from upsc.
.P
Default value: \fIn\fP
.RE
.SS Wowza Media Server (wowza.pm) .SS Wowza Media Server (wowza.pm)
This graph is able to monitor an unlimited number of Wowza servers. This graph is able to monitor an unlimited number of Wowza servers.
.P .P