diff --git a/lib/ambsens.pm b/lib/ambsens.pm index 034e224..e520ba4 100644 --- a/lib/ambsens.pm +++ b/lib/ambsens.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2021 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -270,6 +270,7 @@ sub ambsens_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -302,6 +303,7 @@ sub ambsens_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -478,7 +480,7 @@ sub ambsens_cgi { "--vertical-label=$unit", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/amdgpu.pm b/lib/amdgpu.pm index 1133dcf..f33492b 100644 --- a/lib/amdgpu.pm +++ b/lib/amdgpu.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2021 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -294,6 +294,7 @@ sub amdgpu_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -334,6 +335,7 @@ sub amdgpu_cgi { my $show_current_values = lc($amdgpu->{show_current_values} || "") eq "y" ? 1 : 0; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -705,7 +707,7 @@ sub amdgpu_cgi { "--vertical-label=" . $y_axis_titles_per_plot[$n_plot], "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/apache.pm b/lib/apache.pm index 4390b71..61aa8d4 100644 --- a/lib/apache.pm +++ b/lib/apache.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2021 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -726,6 +726,7 @@ sub apache_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -749,6 +750,7 @@ sub apache_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -924,7 +926,7 @@ sub apache_cgi { "--vertical-label=Workers", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1056,7 +1058,7 @@ sub apache_cgi { "--vertical-label=Workers", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1149,7 +1151,7 @@ sub apache_cgi { "--vertical-label=Percent", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1234,7 +1236,7 @@ sub apache_cgi { "--vertical-label=Requests/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1329,7 +1331,7 @@ sub apache_cgi { "--vertical-label=Workers", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1417,7 +1419,7 @@ sub apache_cgi { "--vertical-label=Slots", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/apcupsd.pm b/lib/apcupsd.pm index a02a76f..53dfdc2 100644 --- a/lib/apcupsd.pm +++ b/lib/apcupsd.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -269,6 +269,7 @@ sub apcupsd_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -293,6 +294,7 @@ sub apcupsd_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -522,7 +524,7 @@ sub apcupsd_cgi { "--vertical-label=Volts", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -627,7 +629,7 @@ sub apcupsd_cgi { "--vertical-label=Percent (%)", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -729,7 +731,7 @@ sub apcupsd_cgi { "--vertical-label=$temp_scale", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -818,7 +820,7 @@ sub apcupsd_cgi { "--vertical-label=Volts", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -906,7 +908,7 @@ sub apcupsd_cgi { "--vertical-label=Minutes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -990,7 +992,7 @@ sub apcupsd_cgi { "--vertical-label=Hz", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/bind.pm b/lib/bind.pm index 394ee4e..02f0847 100644 --- a/lib/bind.pm +++ b/lib/bind.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -578,6 +578,7 @@ sub bind_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -622,6 +623,7 @@ sub bind_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -900,7 +902,7 @@ sub bind_cgi { "--vertical-label=Queries/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1027,7 +1029,7 @@ sub bind_cgi { "--vertical-label=Queries/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1152,7 +1154,7 @@ sub bind_cgi { "--vertical-label=Requests/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1279,7 +1281,7 @@ sub bind_cgi { "--vertical-label=Requests/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1404,7 +1406,7 @@ sub bind_cgi { "--vertical-label=RRsets", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1523,7 +1525,7 @@ sub bind_cgi { "--vertical-label=bytes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1609,7 +1611,7 @@ sub bind_cgi { "--vertical-label=Tasks", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/chrony.pm b/lib/chrony.pm index 5d41ff9..28e9f3c 100644 --- a/lib/chrony.pm +++ b/lib/chrony.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2021 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -230,6 +230,7 @@ sub chrony_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -253,6 +254,7 @@ sub chrony_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -456,7 +458,7 @@ sub chrony_cgi { "--vertical-label=Seconds", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -550,7 +552,7 @@ sub chrony_cgi { "--vertical-label=Seconds", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -638,7 +640,7 @@ sub chrony_cgi { "--vertical-label=Level", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -723,7 +725,7 @@ sub chrony_cgi { "--vertical-label=PPM", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -807,7 +809,7 @@ sub chrony_cgi { "--vertical-label=PPM", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -890,7 +892,7 @@ sub chrony_cgi { "--vertical-label=Seconds", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/disk.pm b/lib/disk.pm index 92f18e6..16c92c0 100644 --- a/lib/disk.pm +++ b/lib/disk.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2021 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -316,6 +316,7 @@ sub disk_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -350,6 +351,7 @@ sub disk_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -583,7 +585,7 @@ sub disk_cgi { "--vertical-label=$temp_scale", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -735,7 +737,7 @@ sub disk_cgi { "--vertical-label=Sectors", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -884,7 +886,7 @@ sub disk_cgi { "--vertical-label=Sectors", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/du.pm b/lib/du.pm index aeddd2a..af17801 100644 --- a/lib/du.pm +++ b/lib/du.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -246,6 +246,7 @@ sub du_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -279,6 +280,7 @@ sub du_cgi { my $type_label; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -496,7 +498,7 @@ sub du_cgi { "--vertical-label=$type_label", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/fail2ban.pm b/lib/fail2ban.pm index e6630c4..2697b94 100644 --- a/lib/fail2ban.pm +++ b/lib/fail2ban.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -241,6 +241,7 @@ sub fail2ban_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -274,6 +275,7 @@ sub fail2ban_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -453,7 +455,7 @@ sub fail2ban_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/fs.pm b/lib/fs.pm index 11d8fd7..1aae5cd 100644 --- a/lib/fs.pm +++ b/lib/fs.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -815,6 +815,7 @@ sub fs_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -850,6 +851,7 @@ sub fs_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -1040,7 +1042,7 @@ sub fs_cgi { "--vertical-label=Percent (%)", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1159,7 +1161,7 @@ sub fs_cgi { "--vertical-label=Reads+Writes/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1275,7 +1277,7 @@ sub fs_cgi { "--vertical-label=Percent (%)", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1437,7 +1439,7 @@ sub fs_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/ftp.pm b/lib/ftp.pm index 8b18c0e..656009f 100644 --- a/lib/ftp.pm +++ b/lib/ftp.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -318,6 +318,7 @@ sub ftp_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -335,6 +336,7 @@ sub ftp_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -510,7 +512,7 @@ sub ftp_cgi { "--vertical-label=Commands/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -615,7 +617,7 @@ sub ftp_cgi { "--vertical-label=Logins/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -716,7 +718,7 @@ sub ftp_cgi { "--vertical-label=bytes/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/gensens.pm b/lib/gensens.pm index 5f7729e..2d30a15 100644 --- a/lib/gensens.pm +++ b/lib/gensens.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -263,6 +263,7 @@ sub gensens_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -296,6 +297,7 @@ sub gensens_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -548,7 +550,7 @@ sub gensens_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/hptemp.pm b/lib/hptemp.pm index f26982a..0987c70 100644 --- a/lib/hptemp.pm +++ b/lib/hptemp.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -262,6 +262,7 @@ sub hptemp_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -292,6 +293,7 @@ sub hptemp_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -511,7 +513,7 @@ sub hptemp_cgi { "--vertical-label=$temp_scale", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -643,7 +645,7 @@ sub hptemp_cgi { "--width=$width", "--height=$height", "--lower-limit=0", - "--full-size-mode", + @full_size_mode, @extra, $zoom, @{$cgi->{version12}}, @@ -769,7 +771,7 @@ sub hptemp_cgi { "--width=$width", "--height=$height", "--lower-limit=0", - "--full-size-mode", + @full_size_mode, @extra, $zoom, @{$cgi->{version12}}, diff --git a/lib/icecast.pm b/lib/icecast.pm index 7f93f3a..4f9c385 100644 --- a/lib/icecast.pm +++ b/lib/icecast.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -236,6 +236,7 @@ sub icecast_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -280,6 +281,7 @@ sub icecast_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -481,7 +483,7 @@ sub icecast_cgi { "--vertical-label=Listeners", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -585,7 +587,7 @@ sub icecast_cgi { "--vertical-label=Bitrate", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/int.pm b/lib/int.pm index 9a90358..271100f 100644 --- a/lib/int.pm +++ b/lib/int.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -443,6 +443,7 @@ sub int_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -822,6 +823,7 @@ sub int_cgi { "#EEEE00"); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -1086,7 +1088,7 @@ sub int_cgi { "--vertical-label=Ticks/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1165,7 +1167,7 @@ sub int_cgi { "--vertical-label=Ticks/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1241,7 +1243,7 @@ sub int_cgi { "--vertical-label=Ticks/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/ipmi.pm b/lib/ipmi.pm index 5dddc9c..aa1e4d5 100644 --- a/lib/ipmi.pm +++ b/lib/ipmi.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -227,6 +227,7 @@ sub ipmi_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -259,6 +260,7 @@ sub ipmi_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -437,7 +439,7 @@ sub ipmi_cgi { "--vertical-label=$unit", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/kern.pm b/lib/kern.pm index 3751d93..502ef81 100644 --- a/lib/kern.pm +++ b/lib/kern.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -391,6 +391,7 @@ sub kern_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -409,6 +410,7 @@ sub kern_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -736,7 +738,7 @@ sub kern_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -845,7 +847,7 @@ sub kern_cgi { "--vertical-label=CS & forks/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -947,7 +949,7 @@ sub kern_cgi { "--vertical-label=Percent (%)", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/libvirt.pm b/lib/libvirt.pm index a95e64a..f2b61fd 100644 --- a/lib/libvirt.pm +++ b/lib/libvirt.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -307,6 +307,7 @@ sub libvirt_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -343,6 +344,7 @@ sub libvirt_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -548,7 +550,7 @@ sub libvirt_cgi { "--vertical-label=Percent (%)", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -670,7 +672,7 @@ sub libvirt_cgi { "--vertical-label=Bytes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -797,7 +799,7 @@ sub libvirt_cgi { "--vertical-label=bytes/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -938,7 +940,7 @@ sub libvirt_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/lighttpd.pm b/lib/lighttpd.pm index 5a3f640..531c0e2 100644 --- a/lib/lighttpd.pm +++ b/lib/lighttpd.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -216,6 +216,7 @@ sub lighttpd_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -240,6 +241,7 @@ sub lighttpd_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -418,7 +420,7 @@ sub lighttpd_cgi { "--vertical-label=Workers", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -513,7 +515,7 @@ sub lighttpd_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -598,7 +600,7 @@ sub lighttpd_cgi { "--vertical-label=Accesses/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/lmsens.pm b/lib/lmsens.pm index 7143018..579d6fc 100644 --- a/lib/lmsens.pm +++ b/lib/lmsens.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2021 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -430,6 +430,7 @@ sub lmsens_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -468,6 +469,7 @@ sub lmsens_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -785,7 +787,7 @@ sub lmsens_cgi { "--vertical-label=$temp_scale", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -977,7 +979,7 @@ sub lmsens_cgi { "--vertical-label=Volts", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1117,7 +1119,7 @@ sub lmsens_cgi { "--vertical-label=$temp_scale", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1259,7 +1261,7 @@ sub lmsens_cgi { "--vertical-label=RPM", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1417,7 +1419,7 @@ sub lmsens_cgi { "--vertical-label=$temp_scale", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/mail.pm b/lib/mail.pm index 52ccc7c..7027939 100644 --- a/lib/mail.pm +++ b/lib/mail.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -725,6 +725,7 @@ sub mail_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -748,6 +749,7 @@ sub mail_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -1122,7 +1124,7 @@ sub mail_cgi { "--vertical-label=$rate_label", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1253,7 +1255,7 @@ sub mail_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1343,7 +1345,7 @@ sub mail_cgi { "--vertical-label=Messages", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1428,7 +1430,7 @@ sub mail_cgi { "--vertical-label=bytes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1522,7 +1524,7 @@ sub mail_cgi { "--vertical-label=Messages", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1636,7 +1638,7 @@ sub mail_cgi { "--vertical-label=$rate_label", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/memcached.pm b/lib/memcached.pm index 1aa1557..f699e5c 100644 --- a/lib/memcached.pm +++ b/lib/memcached.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -410,6 +410,7 @@ sub memcached_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -433,6 +434,7 @@ sub memcached_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -680,7 +682,7 @@ sub memcached_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -817,7 +819,7 @@ sub memcached_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -916,7 +918,7 @@ sub memcached_cgi { "--vertical-label=Megabytes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -999,7 +1001,7 @@ sub memcached_cgi { "--vertical-label=Items", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1090,7 +1092,7 @@ sub memcached_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1183,7 +1185,7 @@ sub memcached_cgi { "--vertical-label=Connections/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1278,7 +1280,7 @@ sub memcached_cgi { "--vertical-label=bytes/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/mongodb.pm b/lib/mongodb.pm index a6ec67a..e8c5181 100644 --- a/lib/mongodb.pm +++ b/lib/mongodb.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -591,6 +591,7 @@ sub mongodb_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -616,6 +617,7 @@ sub mongodb_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -862,7 +864,7 @@ sub mongodb_cgi { "--vertical-label=Operations/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -970,7 +972,7 @@ sub mongodb_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1063,7 +1065,7 @@ sub mongodb_cgi { "--vertical-label=ms", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1151,7 +1153,7 @@ sub mongodb_cgi { "--vertical-label=Connections", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1239,7 +1241,7 @@ sub mongodb_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1348,7 +1350,7 @@ sub mongodb_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1467,7 +1469,7 @@ sub mongodb_cgi { "--vertical-label=Values", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1565,7 +1567,7 @@ sub mongodb_cgi { "--vertical-label=bytes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/mysql.pm b/lib/mysql.pm index ad394d2..f8f5669 100644 --- a/lib/mysql.pm +++ b/lib/mysql.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -500,6 +500,7 @@ sub mysql_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -524,6 +525,7 @@ sub mysql_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -764,7 +766,7 @@ sub mysql_cgi { "--vertical-label=Queries/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -898,7 +900,7 @@ sub mysql_cgi { "--vertical-label=Percent (%)", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -999,7 +1001,7 @@ sub mysql_cgi { "--vertical-label=Open & Locks/min", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1092,7 +1094,7 @@ sub mysql_cgi { "--vertical-label=Queries/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1191,7 +1193,7 @@ sub mysql_cgi { "--vertical-label=Connectionss/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1301,7 +1303,7 @@ sub mysql_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/net.pm b/lib/net.pm index e86abd3..2260216 100644 --- a/lib/net.pm +++ b/lib/net.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -262,6 +262,7 @@ sub net_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -283,6 +284,7 @@ sub net_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -502,7 +504,7 @@ sub net_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -605,7 +607,7 @@ sub net_cgi { "--vertical-label=Packets/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -705,7 +707,7 @@ sub net_cgi { "--vertical-label=Errors/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/netstat.pm b/lib/netstat.pm index ea1bc3e..a682dfb 100644 --- a/lib/netstat.pm +++ b/lib/netstat.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -367,6 +367,7 @@ sub netstat_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -384,6 +385,7 @@ sub netstat_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -562,7 +564,7 @@ sub netstat_cgi { "--vertical-label=Connections", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -690,7 +692,7 @@ sub netstat_cgi { "--vertical-label=Connections", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -796,7 +798,7 @@ sub netstat_cgi { "--vertical-label=Connections", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -904,7 +906,7 @@ sub netstat_cgi { "--vertical-label=Connections", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -996,7 +998,7 @@ sub netstat_cgi { "--vertical-label=Listen", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/nfsc.pm b/lib/nfsc.pm index 1bc35a3..d6598eb 100644 --- a/lib/nfsc.pm +++ b/lib/nfsc.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -232,6 +232,7 @@ sub nfsc_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -280,6 +281,7 @@ sub nfsc_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -469,7 +471,7 @@ sub nfsc_cgi { "--vertical-label=Requests/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -565,7 +567,7 @@ sub nfsc_cgi { "--vertical-label=Requests/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -672,7 +674,7 @@ sub nfsc_cgi { "--vertical-label=Requests/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -776,7 +778,7 @@ sub nfsc_cgi { "--vertical-label=Requests/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -880,7 +882,7 @@ sub nfsc_cgi { "--vertical-label=Requests/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -975,7 +977,7 @@ sub nfsc_cgi { "--vertical-label=Requests/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/nfss.pm b/lib/nfss.pm index b228e10..5996967 100644 --- a/lib/nfss.pm +++ b/lib/nfss.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -367,6 +367,7 @@ sub nfss_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -411,6 +412,7 @@ sub nfss_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -631,7 +633,7 @@ sub nfss_cgi { "--vertical-label=Requests/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -727,7 +729,7 @@ sub nfss_cgi { "--vertical-label=Requests/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -823,7 +825,7 @@ sub nfss_cgi { "--vertical-label=Requests/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -917,7 +919,7 @@ sub nfss_cgi { "--vertical-label=bytes/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1015,7 +1017,7 @@ sub nfss_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1116,7 +1118,7 @@ sub nfss_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1242,7 +1244,7 @@ sub nfss_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1348,7 +1350,7 @@ sub nfss_cgi { "--vertical-label=Requests/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1448,7 +1450,7 @@ sub nfss_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/nginx.pm b/lib/nginx.pm index 19b4bd0..499ad69 100644 --- a/lib/nginx.pm +++ b/lib/nginx.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -264,6 +264,7 @@ sub nginx_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -284,6 +285,7 @@ sub nginx_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -455,7 +457,7 @@ sub nginx_cgi { "--vertical-label=Connections/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -545,7 +547,7 @@ sub nginx_cgi { "--vertical-label=Requests/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -703,7 +705,7 @@ sub nginx_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/ntp.pm b/lib/ntp.pm index 01e3789..fe67d84 100644 --- a/lib/ntp.pm +++ b/lib/ntp.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -208,6 +208,7 @@ sub ntp_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -243,6 +244,7 @@ sub ntp_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -435,7 +437,7 @@ sub ntp_cgi { "--vertical-label=Seconds", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -521,7 +523,7 @@ sub ntp_cgi { "--vertical-label=Level", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -619,7 +621,7 @@ sub ntp_cgi { "--vertical-label=Hits", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/nut.pm b/lib/nut.pm index 2c69e3a..e7f36d7 100644 --- a/lib/nut.pm +++ b/lib/nut.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2021 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -258,6 +258,7 @@ sub nut_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -282,6 +283,7 @@ sub nut_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -510,7 +512,7 @@ sub nut_cgi { "--vertical-label=Volts", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -615,7 +617,7 @@ sub nut_cgi { "--vertical-label=Percent (%)", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -717,7 +719,7 @@ sub nut_cgi { "--vertical-label=$temp_scale", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -806,7 +808,7 @@ sub nut_cgi { "--vertical-label=Volts", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -896,7 +898,7 @@ sub nut_cgi { "--vertical-label=Minutes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -982,7 +984,7 @@ sub nut_cgi { "--vertical-label=Hz", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/nvidia.pm b/lib/nvidia.pm index 596793a..514f2ae 100644 --- a/lib/nvidia.pm +++ b/lib/nvidia.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2021 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -288,6 +288,7 @@ sub nvidia_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -317,6 +318,7 @@ sub nvidia_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -511,7 +513,7 @@ sub nvidia_cgi { "--vertical-label=$temp_scale", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -621,7 +623,7 @@ sub nvidia_cgi { "--vertical-label=Percent", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -728,7 +730,7 @@ sub nvidia_cgi { "--vertical-label=Percent", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/nvidiagpu.pm b/lib/nvidiagpu.pm index 5b749a8..f46c193 100644 --- a/lib/nvidiagpu.pm +++ b/lib/nvidiagpu.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2021 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -263,6 +263,7 @@ sub nvidiagpu_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -303,6 +304,7 @@ sub nvidiagpu_cgi { my $show_current_values = lc($nvidiagpu->{show_current_values} || "") eq "y" ? 1 : 0; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -658,7 +660,7 @@ sub nvidiagpu_cgi { "--vertical-label=" . $y_axis_titles_per_plot[$n_plot], "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/nvme.pm b/lib/nvme.pm index e9cc30a..35dee72 100644 --- a/lib/nvme.pm +++ b/lib/nvme.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2021 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -313,6 +313,7 @@ sub nvme_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -354,6 +355,7 @@ sub nvme_cgi { my $show_current_values = lc($nvme->{show_current_values} || "") eq "y" ? 1 : 0; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -659,7 +661,7 @@ sub nvme_cgi { "--width=$width", "--height=$height", @scaling_options, - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/pagespeed.pm b/lib/pagespeed.pm index d6b1c5b..7765e77 100644 --- a/lib/pagespeed.pm +++ b/lib/pagespeed.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2021 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -652,6 +652,7 @@ sub pagespeed_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -675,6 +676,7 @@ sub pagespeed_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -900,7 +902,7 @@ sub pagespeed_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1033,7 +1035,7 @@ sub pagespeed_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1145,7 +1147,7 @@ sub pagespeed_cgi { "--vertical-label=Percent (%)", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1250,7 +1252,7 @@ sub pagespeed_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1350,7 +1352,7 @@ sub pagespeed_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1446,7 +1448,7 @@ sub pagespeed_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1545,7 +1547,7 @@ sub pagespeed_cgi { "--vertical-label=Value/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1625,7 +1627,7 @@ sub pagespeed_cgi { "--vertical-label=Microseconds/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/pgsql.pm b/lib/pgsql.pm index da37862..18f6e4d 100644 --- a/lib/pgsql.pm +++ b/lib/pgsql.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2021 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -655,6 +655,7 @@ sub pgsql_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -677,6 +678,7 @@ sub pgsql_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -910,7 +912,7 @@ sub pgsql_cgi { "--vertical-label=Tuples/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1039,7 +1041,7 @@ sub pgsql_cgi { "--vertical-label=Buffers written/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1131,7 +1133,7 @@ sub pgsql_cgi { "--vertical-label=bytes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1230,7 +1232,7 @@ sub pgsql_cgi { "--vertical-label=Connections", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1325,7 +1327,7 @@ sub pgsql_cgi { "--vertical-label=Transactions/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1417,7 +1419,7 @@ sub pgsql_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1550,7 +1552,7 @@ sub pgsql_cgi { "--vertical-label=Tuples/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1662,7 +1664,7 @@ sub pgsql_cgi { "--vertical-label=Connections", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1756,7 +1758,7 @@ sub pgsql_cgi { "--vertical-label=bytes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1852,7 +1854,7 @@ sub pgsql_cgi { "--vertical-label=Transactions/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1949,7 +1951,7 @@ sub pgsql_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/phpapc.pm b/lib/phpapc.pm index 1e335ba..8bf3538 100644 --- a/lib/phpapc.pm +++ b/lib/phpapc.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -212,6 +212,7 @@ sub phpapc_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -235,6 +236,7 @@ sub phpapc_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -439,7 +441,7 @@ sub phpapc_cgi { "--vertical-label=Percent (%)", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -535,7 +537,7 @@ sub phpapc_cgi { "--vertical-label=Percent (%)", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -623,7 +625,7 @@ sub phpapc_cgi { "--vertical-label=Cached files/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/phpfpm.pm b/lib/phpfpm.pm index 1c60d0d..28e6714 100644 --- a/lib/phpfpm.pm +++ b/lib/phpfpm.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2021 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -248,6 +248,7 @@ sub phpfpm_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -282,6 +283,7 @@ sub phpfpm_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -494,7 +496,7 @@ sub phpfpm_cgi { "--vertical-label=Connections/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -590,7 +592,7 @@ sub phpfpm_cgi { "--vertical-label=Processes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -687,7 +689,7 @@ sub phpfpm_cgi { "--vertical-label=Listening", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -796,7 +798,7 @@ sub phpfpm_cgi { "--vertical-label=Processes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -905,7 +907,7 @@ sub phpfpm_cgi { "--vertical-label=Children", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -998,7 +1000,7 @@ sub phpfpm_cgi { "--vertical-label=Requests", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/port.pm b/lib/port.pm index c741755..3521a2a 100644 --- a/lib/port.pm +++ b/lib/port.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -343,6 +343,7 @@ sub port_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -369,6 +370,7 @@ sub port_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -683,7 +685,7 @@ sub port_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/proc.pm b/lib/proc.pm index c488b42..3a3da3d 100644 --- a/lib/proc.pm +++ b/lib/proc.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -260,6 +260,7 @@ sub proc_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -283,6 +284,7 @@ sub proc_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -653,7 +655,7 @@ sub proc_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/process.pm b/lib/process.pm index 9a9349c..466ac37 100644 --- a/lib/process.pm +++ b/lib/process.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2021 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -343,6 +343,7 @@ sub process_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -381,6 +382,7 @@ sub process_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -580,7 +582,7 @@ sub process_cgi { "--vertical-label=Percent (%)", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -704,7 +706,7 @@ sub process_cgi { "--vertical-label=bytes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -835,7 +837,7 @@ sub process_cgi { "--vertical-label=bytes/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -982,7 +984,7 @@ sub process_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1093,7 +1095,7 @@ sub process_cgi { "--vertical-label=Files", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1207,7 +1209,7 @@ sub process_cgi { "--vertical-label=Threads", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1354,7 +1356,7 @@ sub process_cgi { "--vertical-label=Nonvoluntary + voluntary/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1499,7 +1501,7 @@ sub process_cgi { "--vertical-label=Processes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1636,7 +1638,7 @@ sub process_cgi { "--vertical-label=$ytitle", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1760,7 +1762,8 @@ sub process_cgi { # "--vertical-label=Xxxxxxxxx", # "--width=$width", # "--height=$height", -# "--full-size-mode", @extra, +# @full_size_mode, +# @extra, # @riglim, # $zoom, # @{$cgi->{version12}}, diff --git a/lib/raspberrypi.pm b/lib/raspberrypi.pm index f134614..4496019 100644 --- a/lib/raspberrypi.pm +++ b/lib/raspberrypi.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -219,6 +219,7 @@ sub raspberrypi_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -248,6 +249,7 @@ sub raspberrypi_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -443,7 +445,7 @@ sub raspberrypi_cgi { "--vertical-label=Hz", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -542,7 +544,7 @@ sub raspberrypi_cgi { "--vertical-label=$temp_scale", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -636,7 +638,7 @@ sub raspberrypi_cgi { "--vertical-label=Volts", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/redis.pm b/lib/redis.pm index 75dfa5e..b472434 100644 --- a/lib/redis.pm +++ b/lib/redis.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2021 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -352,6 +352,7 @@ sub redis_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -377,6 +378,7 @@ sub redis_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -573,7 +575,7 @@ sub redis_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -681,7 +683,7 @@ sub redis_cgi { "--vertical-label=Ratio", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -779,7 +781,7 @@ sub redis_cgi { "--vertical-label=Clients", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -868,7 +870,7 @@ sub redis_cgi { "--vertical-label=Bytes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -960,7 +962,7 @@ sub redis_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1070,7 +1072,7 @@ sub redis_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/serv.pm b/lib/serv.pm index 6e59da4..f68ef68 100644 --- a/lib/serv.pm +++ b/lib/serv.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -644,6 +644,7 @@ sub serv_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -663,6 +664,7 @@ sub serv_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -938,7 +940,7 @@ sub serv_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1063,7 +1065,7 @@ sub serv_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1188,7 +1190,7 @@ sub serv_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/squid.pm b/lib/squid.pm index c7c3979..fb293ac 100644 --- a/lib/squid.pm +++ b/lib/squid.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -473,6 +473,7 @@ sub squid_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -521,6 +522,7 @@ sub squid_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -795,7 +797,7 @@ sub squid_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -892,7 +894,7 @@ sub squid_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1023,7 +1025,7 @@ sub squid_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1126,7 +1128,7 @@ sub squid_cgi { "--vertical-label=bytes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1222,7 +1224,7 @@ sub squid_cgi { "--vertical-label=bytes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1322,7 +1324,7 @@ sub squid_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1426,7 +1428,7 @@ sub squid_cgi { "--vertical-label=Reads/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1536,7 +1538,7 @@ sub squid_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1644,7 +1646,7 @@ sub squid_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/system.pm b/lib/system.pm index 144a2e0..8326019 100644 --- a/lib/system.pm +++ b/lib/system.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -440,6 +440,7 @@ sub system_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -457,6 +458,7 @@ sub system_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -642,7 +644,7 @@ sub system_cgi { "--vertical-label=Load average", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -753,7 +755,7 @@ sub system_cgi { "--lower-limit=0", "--rigid", "--base=1024", - "--full-size-mode", + @full_size_mode, @extra, $zoom, @{$cgi->{version12}}, @@ -885,7 +887,7 @@ sub system_cgi { "--vertical-label=Processes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -971,7 +973,7 @@ sub system_cgi { "--vertical-label=Size", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1068,7 +1070,7 @@ sub system_cgi { "--vertical-label=$ytitle", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/tc.pm b/lib/tc.pm index 917400a..366076b 100644 --- a/lib/tc.pm +++ b/lib/tc.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -307,6 +307,7 @@ sub tc_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -344,6 +345,7 @@ sub tc_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -559,7 +561,7 @@ sub tc_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -672,7 +674,7 @@ sub tc_cgi { "--vertical-label=Packets/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -782,7 +784,7 @@ sub tc_cgi { "--vertical-label=Packets/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -894,7 +896,7 @@ sub tc_cgi { "--vertical-label=Packets/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/tinyproxy.pm b/lib/tinyproxy.pm index d8e8724..67f3024 100644 --- a/lib/tinyproxy.pm +++ b/lib/tinyproxy.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2021 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -257,6 +257,7 @@ sub tinyproxy_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -280,6 +281,7 @@ sub tinyproxy_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -446,7 +448,7 @@ sub tinyproxy_cgi { "--vertical-label=Requests", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -532,7 +534,7 @@ sub tinyproxy_cgi { "--vertical-label=Connections", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -623,7 +625,7 @@ sub tinyproxy_cgi { "--vertical-label=Connections", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/traffacct.pm b/lib/traffacct.pm index 2c0dbcf..b58dec3 100644 --- a/lib/traffacct.pm +++ b/lib/traffacct.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2021 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -502,6 +502,7 @@ sub traffacct_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -526,6 +527,7 @@ sub traffacct_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -642,7 +644,7 @@ sub traffacct_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -759,7 +761,7 @@ sub traffacct_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/unbound.pm b/lib/unbound.pm index f9f38a6..02b28a3 100644 --- a/lib/unbound.pm +++ b/lib/unbound.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -824,6 +824,7 @@ sub unbound_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -864,6 +865,7 @@ sub unbound_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -1119,7 +1121,7 @@ sub unbound_cgi { "--vertical-label=Queries/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1235,7 +1237,7 @@ sub unbound_cgi { "--vertical-label=Queries/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1344,7 +1346,7 @@ sub unbound_cgi { "--vertical-label=Seconds", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1429,7 +1431,7 @@ sub unbound_cgi { "--vertical-label=Days", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1541,7 +1543,7 @@ sub unbound_cgi { "--vertical-label=Queries/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1649,7 +1651,7 @@ sub unbound_cgi { "--vertical-label=bytes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1797,7 +1799,7 @@ sub unbound_cgi { "--vertical-label=Queries/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1950,7 +1952,7 @@ sub unbound_cgi { "--vertical-label=Queries/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -2104,7 +2106,7 @@ sub unbound_cgi { "--vertical-label=Queries/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -2257,7 +2259,7 @@ sub unbound_cgi { "--vertical-label=Queries/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/user.pm b/lib/user.pm index 2e552d0..58de4a0 100644 --- a/lib/user.pm +++ b/lib/user.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -176,6 +176,7 @@ sub user_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -193,6 +194,7 @@ sub user_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -327,7 +329,7 @@ sub user_cgi { "--vertical-label=Users", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -414,7 +416,7 @@ sub user_cgi { "--vertical-label=Users", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -498,7 +500,7 @@ sub user_cgi { "--vertical-label=Users", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/varnish.pm b/lib/varnish.pm index 095401a..16066a6 100644 --- a/lib/varnish.pm +++ b/lib/varnish.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -386,6 +386,7 @@ sub varnish_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -403,6 +404,7 @@ sub varnish_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -610,7 +612,7 @@ sub varnish_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -745,7 +747,7 @@ sub varnish_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -846,7 +848,7 @@ sub varnish_cgi { "--vertical-label=Connections/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -938,7 +940,7 @@ sub varnish_cgi { "--vertical-label=Values/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1034,7 +1036,7 @@ sub varnish_cgi { "--vertical-label=Objects", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1129,7 +1131,7 @@ sub varnish_cgi { "--vertical-label=bytes/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/verlihub.pm b/lib/verlihub.pm index b78956b..d2cd412 100644 --- a/lib/verlihub.pm +++ b/lib/verlihub.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -177,6 +177,7 @@ sub verlihub_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -194,6 +195,7 @@ sub verlihub_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -329,7 +331,7 @@ sub verlihub_cgi { "--vertical-label=Users", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -420,7 +422,7 @@ sub verlihub_cgi { "--width=$width", "--height=$height", "--units-exponent=0", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -506,7 +508,7 @@ sub verlihub_cgi { "--width=$width", "--height=$height", "--units-exponent=0", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/wowza.pm b/lib/wowza.pm index 8c4becd..739ea44 100644 --- a/lib/wowza.pm +++ b/lib/wowza.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -401,6 +401,7 @@ sub wowza_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -448,6 +449,7 @@ sub wowza_cgi { ); $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -653,7 +655,7 @@ sub wowza_cgi { "--vertical-label=Connections", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -765,7 +767,7 @@ sub wowza_cgi { "--vertical-label=$vlabel", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -872,7 +874,7 @@ sub wowza_cgi { "--vertical-label=Connections/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -967,7 +969,7 @@ sub wowza_cgi { "--vertical-label=Connections/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1062,7 +1064,7 @@ sub wowza_cgi { "--vertical-label=Sessions", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, diff --git a/lib/zfs.pm b/lib/zfs.pm index ccc8800..b5b6c37 100644 --- a/lib/zfs.pm +++ b/lib/zfs.pm @@ -1,7 +1,7 @@ # # Monitorix - A lightweight system monitoring tool. # -# Copyright (C) 2005-2020 by Jordi Sanfeliu +# Copyright (C) 2005-2022 by Jordi Sanfeliu # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -411,6 +411,7 @@ sub zfs_cgi { 'old' => \&RRDs::graph, ); my $version = "new"; + my @full_size_mode; my $pic; my $picz; my $picz_width; @@ -432,6 +433,7 @@ sub zfs_cgi { my $err; $version = "old" if $RRDs::VERSION < 1.3; + push(@full_size_mode, "--full-size-mode") if $RRDs::VERSION > 1.3; my $rrd = $config->{base_lib} . $package . ".rrd"; my $title = $config->{graph_title}->{$package}; my $IMG_DIR = $config->{base_dir} . "/" . $config->{imgs_dir}; @@ -641,7 +643,7 @@ sub zfs_cgi { "--vertical-label=bytes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -740,7 +742,7 @@ sub zfs_cgi { "--vertical-label=Reads/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -828,7 +830,7 @@ sub zfs_cgi { "--vertical-label=Reads/s", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -929,7 +931,7 @@ sub zfs_cgi { "--vertical-label=bytes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1018,7 +1020,7 @@ sub zfs_cgi { "--vertical-label=Percent (%)", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1111,7 +1113,7 @@ sub zfs_cgi { "--vertical-label=Number", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom, @@ -1203,7 +1205,7 @@ sub zfs_cgi { "--vertical-label=bytes", "--width=$width", "--height=$height", - "--full-size-mode", + @full_size_mode, @extra, @riglim, $zoom,