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

Add gap_on_all_nan option

This commit is contained in:
Andreas Bachlechner 2021-10-11 16:38:03 +02:00
parent c87fe89db4
commit 76b0655b22
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/nvme.pm
View File

@ -233,10 +233,12 @@ sub nvme_update {
if(/\"temperature\"/) { if(/\"temperature\"/) {
my @tmp = split(':', $_); my @tmp = split(':', $_);
$tmp[1] =~ tr/,//d; $tmp[1] =~ tr/,//d;
$temp = trim($tmp[1]) unless $temp; if (index($tmp[1], "{") == -1) {
$temp = trim($tmp[1]);
chomp($temp); chomp($temp);
} }
} }
}
close(IN); close(IN);
} }
$rrdata .= ":$temp"; $rrdata .= ":$temp";
@ -345,7 +347,7 @@ sub nvme_cgi {
if(lc($config->{temperature_scale}) eq "f") { if(lc($config->{temperature_scale}) eq "f") {
$temp_scale = "Fahrenheit"; $temp_scale = "Fahrenheit";
} }
my $gap_on_all_nan = lc($nvme->{gap_on_all_nan} || "") eq "y" ? 1 : 0;
# text mode # text mode
# #
@ -527,9 +529,16 @@ sub nvme_cgi {
if($n_hd != 0) { if($n_hd != 0) {
$cdef_temp_allvalues .= ","; $cdef_temp_allvalues .= ",";
} }
if ($gap_on_all_nan) {
$cdef_temp_allvalues .= "temp" . $n_hd . ",UN,0,1,IF";
} else {
$cdef_temp_allvalues .= "temp" . $n_hd; $cdef_temp_allvalues .= "temp" . $n_hd;
} }
}
$cdef_temp_allvalues .= ",+" x ($max_number_of_hds - 1); $cdef_temp_allvalues .= ",+" x ($max_number_of_hds - 1);
if ($gap_on_all_nan) {
$cdef_temp_allvalues .= ",0,GT,1,UNKN,IF";
}
$pic = $rrd{$version}->("$IMG_DIR" . "$IMG[$e * 3]", $pic = $rrd{$version}->("$IMG_DIR" . "$IMG[$e * 3]",
"--title=$config->{graphs}->{_nvme1} ($tf->{nwhen}$tf->{twhen})", "--title=$config->{graphs}->{_nvme1} ($tf->{nwhen}$tf->{twhen})",
@ -678,9 +687,16 @@ sub nvme_cgi {
if($n_hd != 0) { if($n_hd != 0) {
$cdef_smart_allvalues .= ","; $cdef_smart_allvalues .= ",";
} }
if ($gap_on_all_nan) {
$cdef_smart_allvalues .= $value_name . ",UN,0,1,IF";
} else {
$cdef_smart_allvalues .= $value_name; $cdef_smart_allvalues .= $value_name;
} }
}
$cdef_smart_allvalues .= ",+" x ($max_number_of_hds - 1); $cdef_smart_allvalues .= ",+" x ($max_number_of_hds - 1);
if ($gap_on_all_nan) {
$cdef_smart_allvalues .= ",0,GT,1,UNKN,IF";
}
my $plot_title = $config->{graphs}->{'_nvme' . ($n_smart + 2)}; my $plot_title = $config->{graphs}->{'_nvme' . ($n_smart + 2)};
$pic = $rrd{$version}->("$IMG_DIR" . "$IMG[$e * 3 + $n_smart + 1]", $pic = $rrd{$version}->("$IMG_DIR" . "$IMG[$e * 3 + $n_smart + 1]",