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

fixed some indentations #367

This commit is contained in:
Jordi Sanfeliu 2021-12-10 10:50:16 +01:00
parent a2008d488e
commit 3bb03e983b
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/amdgpu.pm
View File

@ -217,7 +217,7 @@ sub amdgpu_update {
my @sensor_names = split(',', $amdgpu->{sensors}->{$str}); my @sensor_names = split(',', $amdgpu->{sensors}->{$str});
for(my $i_sensor = 0; $i_sensor < $number_of_values_per_gpu_in_rrd; $i_sensor++) { for(my $i_sensor = 0; $i_sensor < $number_of_values_per_gpu_in_rrd; $i_sensor++) {
if ($i_sensor < scalar(@sensor_names)) { if ($i_sensor < scalar(@sensor_names)) {
my $sensor_name = $sensor_names[$i_sensor]; my $sensor_name = $sensor_names[$i_sensor];
chomp($sensor_name); chomp($sensor_name);
$sensor_name = trim($sensor_name); $sensor_name = trim($sensor_name);
@ -551,7 +551,7 @@ sub amdgpu_cgi {
$dstr =~ s/^\"//; $dstr =~ s/^\"//;
$dstr =~ s/\"$//; $dstr =~ s/\"$//;
# $dstr =~ s/^(.+?) .*$/$1/; # $dstr =~ s/^(.+?) .*$/$1/;
if($base && defined($amdgpu->{map}->{$base})) { if($base && defined($amdgpu->{map}->{$base})) {
$dstr = $amdgpu->{map}->{$base}; $dstr = $amdgpu->{map}->{$base};
} else { } else {
@ -561,7 +561,7 @@ sub amdgpu_cgi {
} }
if($n_plot < $main_sensor_plots) { if($n_plot < $main_sensor_plots) {
if($main_plots_with_average[$n_plot]) { if($main_plots_with_average[$n_plot]) {
$str = sprintf("%-20s", $dstr); $str = sprintf("%-20s", $dstr);
} else { } else {
$str = sprintf("%-57s", $dstr); $str = sprintf("%-57s", $dstr);
} }
@ -579,7 +579,7 @@ sub amdgpu_cgi {
push(@tmpz, "LINE2:trans_" . $value_name . $LC[$n] . ":$dstr"); push(@tmpz, "LINE2:trans_" . $value_name . $LC[$n] . ":$dstr");
if ($n_sensor2) { if ($n_sensor2) {
$value_name2 = "gpu" . $n . "_val" . $n_sensor2; $value_name2 = "gpu" . $n . "_val" . $n_sensor2;
push(@tmp, "LINE2:trans_" . $value_name2 . $LC[$n] . "BB" . ":dashes=1,3:"); push(@tmp, "LINE2:trans_" . $value_name2 . $LC[$n] . "BB" . ":dashes=1,3:");
push(@tmpz, "LINE2:trans_" . $value_name2 . $LC[$n] . "BB" . ":dashes=1,3:"); push(@tmpz, "LINE2:trans_" . $value_name2 . $LC[$n] . "BB" . ":dashes=1,3:");
} }
@ -661,7 +661,7 @@ sub amdgpu_cgi {
my $value_name = "gpu" . $n_gpu . "_val" . $n_sensor; my $value_name = "gpu" . $n_gpu . "_val" . $n_sensor;
push(@def_sensor_average, "DEF:" . $value_name . "=$rrd:amdgpu" . $e . "_" . $value_name . ":AVERAGE"); push(@def_sensor_average, "DEF:" . $value_name . "=$rrd:amdgpu" . $e . "_" . $value_name . ":AVERAGE");
if($n_sensor2) { if($n_sensor2) {
my $value_name2 = "gpu" . $n_gpu . "_val" . $n_sensor2; my $value_name2 = "gpu" . $n_gpu . "_val" . $n_sensor2;
push(@def_sensor_average, "DEF:" . $value_name2 . "=$rrd:amdgpu" . $e . "_" . $value_name2 . ":AVERAGE"); push(@def_sensor_average, "DEF:" . $value_name2 . "=$rrd:amdgpu" . $e . "_" . $value_name2 . ":AVERAGE");
} }

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

@ -1398,6 +1398,7 @@ This list specifies the sensor locations in absolute paths. If a certain card do
.br .br
</sensors> </sensors>
.RE .RE
.RE
.P .P
.BI map .BI map
.RS .RS
@ -1525,7 +1526,7 @@ Print current values in the legend of the small righthand plots.
.P .P
Default value: \fIn\fP Default value: \fIn\fP
.RE .RE
.RE .P
.BI use_nan_for_missing_data .BI use_nan_for_missing_data
.RS .RS
This option, when enabled via \fIy\fP, shows \fnan\fP values for missing data instead of \f0\fP. This is useful when \f0\fP could be mistaken for valid data. This option, when enabled via \fIy\fP, shows \fnan\fP values for missing data instead of \f0\fP. This is useful when \f0\fP could be mistaken for valid data.

2
monitorix.conf
View File

@ -303,7 +303,7 @@ secure_log_date_format = %b %e
<amdgpu> <amdgpu>
<list> <list>
0 = /dev/amd-w6800, /dev/amd-wx5100 0 = /dev/amd-w6800, /dev/amd-wx5100
</list> </list>
rigid = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 rigid = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
limit = 100, 100, 100, 100, 100, 100, 100, 100, 100, 100 limit = 100, 100, 100, 100, 100, 100, 100, 100, 100, 100
use_nan_for_missing_data = y use_nan_for_missing_data = y