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

Remove show_more_extened_plots config option. It is now default.

This commit is contained in:
Andreas Bachlechner 2022-02-19 00:17:28 +01:00
parent 4f2ae34a54
commit e252e8f6ff
3 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/nvme.pm
View File

@ -399,16 +399,7 @@ sub nvme_cgi {
); );
my $show_extended_plots = lc($nvme->{show_extended_plots} || "") eq "y" ? 1 : 0; my $show_extended_plots = lc($nvme->{show_extended_plots} || "") eq "y" ? 1 : 0;
my $show_more_extened_plots = lc($nvme->{show_more_extened_plots} || "") eq "y" ? 1 : 0; my $number_of_smart_values_in_use = $show_extended_plots ? 9 : 3;
my $number_of_smart_values_in_use = 3;
if ($show_more_extened_plots) {
$number_of_smart_values_in_use = 9;
} else {
if ($show_extended_plots) {
$number_of_smart_values_in_use = 6;
}
}
if($number_of_smart_values_in_use > $number_of_smart_values_in_rrd) { if($number_of_smart_values_in_use > $number_of_smart_values_in_rrd) {
logger(@output, "ERROR: Number of smart values (" . $number_of_smart_values_in_use . ") has smaller or equal to number of smart values in rrd (" . $number_of_smart_values_in_rrd . ")!"); logger(@output, "ERROR: Number of smart values (" . $number_of_smart_values_in_use . ") has smaller or equal to number of smart values in rrd (" . $number_of_smart_values_in_rrd . ")!");
return; return;
@ -521,18 +512,11 @@ sub nvme_cgi {
my @main_plot_with_average = (1); # Wether or not the main plots show average, min and max or only the last value in the legend. my @main_plot_with_average = (1); # Wether or not the main plots show average, min and max or only the last value in the legend.
my @alt_axis_scaling = (0, 0, 0); my @alt_axis_scaling = (0, 0, 0);
my @logarithmic_axis_scaling = (0, 0, 0); my @logarithmic_axis_scaling = (0, 0, 0);
if ($show_more_extened_plots) { if ($show_extended_plots) {
@plot_order = (0, 8, 7, 1, 2, 4, 5, 6, 3); @plot_order = (0, 8, 7, 1, 2, 4, 5, 6, 3);
@main_plot_with_average = (1, 1, 1); @main_plot_with_average = (1, 1, 1);
@alt_axis_scaling = (0, 0, 0, 0, 0, 0, 0, 1, 1); @alt_axis_scaling = (0, 0, 0, 0, 0, 0, 0, 1, 1);
@logarithmic_axis_scaling = (0, 0, 0, 0, 0, 0, 0, 0, 0); @logarithmic_axis_scaling = (0, 0, 0, 0, 0, 0, 0, 0, 0);
} else {
if ($show_extended_plots) {
@plot_order = (0, 3, 1, 2, 4, 5);
@main_plot_with_average = (1, 0);
@alt_axis_scaling = (0, 0, 0, 1, 0, 0);
@logarithmic_axis_scaling = (0, 0, 0, 0, 0, 0);
}
} }
my $main_smart_plots = scalar(@main_plot_with_average); # Number of smart plots on the left side. my $main_smart_plots = scalar(@main_plot_with_average); # Number of smart plots on the left side.
my $number_of_plots = scalar(@plot_order); my $number_of_plots = scalar(@plot_order);

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

@ -2078,19 +2078,10 @@ Default value: \fIn\fP
.BI show_extended_plots .BI show_extended_plots
.RS .RS
.P .P
Show additional plots for total bytes written, media errors and unsafe shutdowns. Show additional plots for mean read and written bytes per second, total bytes read and written, media errors and unsafe shutdowns
.P .P
Default value: \fIy\fP Default value: \fIy\fP
.RE .RE
.P
.BI show_more_extened_plots
.RS
.P
Show additional plots for mean read and written bytes per second, total bytes read and written, media errors and unsafe shutdowns. If set \fIshow_extended_plots\fP will be ignored.
.P
Default value: \fIn\fP
.RE
.P .P
.BI show_current_values .BI show_current_values
.RS .RS

1
monitorix.conf
View File

@ -403,7 +403,6 @@ secure_log_date_format = %b %e
rigid = 0, 0, 0, 0, 0, 0, 0, 0, 0 rigid = 0, 0, 0, 0, 0, 0, 0, 0, 0
limit = 10, 100, 100, 100, 100, 100, 100, 100, 100 limit = 10, 100, 100, 100, 100, 100, 100, 100, 100
show_extended_plots = y show_extended_plots = y
show_more_extened_plots = n
<alerts> <alerts>
availspare_enabled = n availspare_enabled = n
availspare_timeintvl = 0 availspare_timeintvl = 0