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

Merge pull request #411 from bachandi/legend_alignment_fixes 

Fix legend alignment in nvidiagpu and amdgpu.
This commit is contained in:
Jordi Sanfeliu 2022-03-11 10:55:00 +01:00 committed by GitHub
parent 7f147f4234 4dd94974f1
commit 3893da5072
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/amdgpu.pm
View File

@ -478,10 +478,10 @@ sub amdgpu_cgi {
"%4.2lf%s",
"%5.0lf%s",
"%5.0lf%s",
"%3.1lf%%",
"%3.1lf",
"%3.1lf",
"%3.1lf"
"%5.1lf%%",
"%5.1lf",
"%5.1lf",
"%5.1lf"
);
my @graphs_per_plot = (7, 8, 10, 9, [5, 6], 0, 1, 2, 3, 4); # To rearange the graphs
@ -597,12 +597,12 @@ sub amdgpu_cgi {
push(@tmp, "COMMENT: N/A\\n");
} else {
if($main_plots_with_average[$n_plot]) {
push(@tmp, "GPRINT:trans_" . $value_name . ":LAST: Current\\: " . $legend_labels_per_sensor[$n_sensor]);
push(@tmp, "GPRINT:trans_" . $value_name . ":AVERAGE: Average\\: " . $legend_labels_per_sensor[$n_sensor]);
push(@tmp, "GPRINT:trans_" . $value_name . ":MIN: Min\\: " . $legend_labels_per_sensor[$n_sensor]);
push(@tmp, "GPRINT:trans_" . $value_name . ":MAX: Max\\: " . $legend_labels_per_sensor[$n_sensor] . "\\n");
push(@tmp, "GPRINT:trans_" . $value_name . ":LAST: Current\\:" . $legend_labels_per_sensor[$n_sensor]);
push(@tmp, "GPRINT:trans_" . $value_name . ":AVERAGE: Average\\:" . $legend_labels_per_sensor[$n_sensor]);
push(@tmp, "GPRINT:trans_" . $value_name . ":MIN: Min\\:" . $legend_labels_per_sensor[$n_sensor]);
push(@tmp, "GPRINT:trans_" . $value_name . ":MAX: Max\\:" . $legend_labels_per_sensor[$n_sensor] . "\\n");
} else {
push(@tmp, "GPRINT:trans_" . $value_name . ":LAST: Current\\: " . $legend_labels_per_sensor[$n_sensor] . "\\n");
push(@tmp, "GPRINT:trans_" . $value_name . ":LAST: Current\\:" . $legend_labels_per_sensor[$n_sensor] . "\\n");
}
}
} else {

18
lib/nvidiagpu.pm
View File

@ -444,13 +444,13 @@ sub nvidiagpu_cgi {
"%4.2lf%s",
"%3.0lf%%",
"%3.0lf%%",
"%3.1lf",
"%3.1lf",
"%3.1lf%%",
"%5.1lf",
"%5.1lf",
"%5.1lf%%",
"%1.0lf",
"%5.0lf%s",
"%5.0lf%s",
"%3.1lf%%"
"%5.1lf%%"
);
my @graphs_per_plot = (6, 4, 5, 10, [8, 9], 2, 3, 0, 1, 7); # To rearange the graphs
@ -555,12 +555,12 @@ sub nvidiagpu_cgi {
if($n_plot < $main_sensor_plots) {
if($main_plots_with_average[$n_plot]) {
push(@tmp, "GPRINT:trans_" . $value_name . ":LAST: Current\\: " . $legend_labels_per_sensor[$n_sensor]);
push(@tmp, "GPRINT:trans_" . $value_name . ":AVERAGE: Average\\: " . $legend_labels_per_sensor[$n_sensor]);
push(@tmp, "GPRINT:trans_" . $value_name . ":MIN: Min\\: " . $legend_labels_per_sensor[$n_sensor]);
push(@tmp, "GPRINT:trans_" . $value_name . ":MAX: Max\\: " . $legend_labels_per_sensor[$n_sensor] . "\\n");
push(@tmp, "GPRINT:trans_" . $value_name . ":LAST: Current\\:" . $legend_labels_per_sensor[$n_sensor]);
push(@tmp, "GPRINT:trans_" . $value_name . ":AVERAGE: Average\\:" . $legend_labels_per_sensor[$n_sensor]);
push(@tmp, "GPRINT:trans_" . $value_name . ":MIN: Min\\:" . $legend_labels_per_sensor[$n_sensor]);
push(@tmp, "GPRINT:trans_" . $value_name . ":MAX: Max\\:" . $legend_labels_per_sensor[$n_sensor] . "\\n");
} else {
push(@tmp, "GPRINT:trans_" . $value_name . ":LAST: Current\\: " . $legend_labels_per_sensor[$n_sensor] . "\\n");
push(@tmp, "GPRINT:trans_" . $value_name . ":LAST: Current\\: " . $legend_labels_per_sensor[$n_sensor] . "\\n");
}
} else {
if($show_current_values) {