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

added support for the new 'max_historic_years' option to the 'disk' graph

This commit is contained in:
Jordi Sanfeliu 2013-10-14 15:24:30 +02:00
parent e89b3b15df
commit 685788a2d3
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/disk.pm
View File

@ -35,9 +35,15 @@ sub disk_init {
my $info; my $info;
my @ds; my @ds;
my @rra;
my @tmp; my @tmp;
my $n; my $n;
my @average;
my @min;
my @max;
my @last;
foreach my $k (sort keys %{$disk->{list}}) { foreach my $k (sort keys %{$disk->{list}}) {
# values delimitted by ", " (comma + space) # values delimitted by ", " (comma + space)
my @dsk = split(', ', $disk->{list}->{$k}); my @dsk = split(', ', $disk->{list}->{$k});
@ -65,15 +71,30 @@ sub disk_init {
push(@ds, substr($key, 3, index($key, ']') - 3)); push(@ds, substr($key, 3, index($key, ']') - 3));
} }
} }
if(index($key, 'rra[') == 0) {
if(index($key, '.rows') != -1) {
push(@rra, substr($key, 4, index($key, ']') - 4));
}
}
} }
if(scalar(@ds) / 24 != keys(%{$disk->{list}})) { if(scalar(@ds) / 24 != keys(%{$disk->{list}})) {
logger("$myself: Detected size mismatch between <list>...</list> (" . keys(%{$disk->{list}}) . ") and $rrd (" . scalar(@ds) / 24 . "). Resizing it accordingly. All historic data will be lost. Backup file created."); logger("$myself: Detected size mismatch between <list>...</list> (" . keys(%{$disk->{list}}) . ") and $rrd (" . scalar(@ds) / 24 . "). Resizing it accordingly. All historic data will be lost. Backup file created.");
rename($rrd, "$rrd.bak"); rename($rrd, "$rrd.bak");
} }
if(scalar(@rra) != 12 + (4 * $config->{max_historic_years})) {
logger("$myself: Detected size mismatch between 'max_historic_years' option (" . $config->{max_historic_years} . ") and $rrd (" . ((scalar(@rra) -12) / 4) . "). Resizing it accordingly. All historic data will be lost. Backup file created.");
rename($rrd, "$rrd.bak");
}
} }
if(!(-e $rrd)) { if(!(-e $rrd)) {
logger("Creating '$rrd' file."); logger("Creating '$rrd' file.");
for($n = 1; $n <= $config->{max_historic_years}; $n++) {
push(@average, "RRA:AVERAGE:0.5:1440:" . (365 * $n));
push(@min, "RRA:MIN:0.5:1440:" . (365 * $n));
push(@max, "RRA:MAX:0.5:1440:" . (365 * $n));
push(@last, "RRA:LAST:0.5:1440:" . (365 * $n));
}
for($n = 0; $n < keys(%{$disk->{list}}); $n++) { for($n = 0; $n < keys(%{$disk->{list}}); $n++) {
push(@tmp, "DS:disk" . $n . "_hd0_temp:GAUGE:120:0:100"); push(@tmp, "DS:disk" . $n . "_hd0_temp:GAUGE:120:0:100");
push(@tmp, "DS:disk" . $n . "_hd0_smart1:GAUGE:120:0:U"); push(@tmp, "DS:disk" . $n . "_hd0_smart1:GAUGE:120:0:U");
@ -107,19 +128,19 @@ sub disk_init {
"RRA:AVERAGE:0.5:1:1440", "RRA:AVERAGE:0.5:1:1440",
"RRA:AVERAGE:0.5:30:336", "RRA:AVERAGE:0.5:30:336",
"RRA:AVERAGE:0.5:60:744", "RRA:AVERAGE:0.5:60:744",
"RRA:AVERAGE:0.5:1440:365", @average,
"RRA:MIN:0.5:1:1440", "RRA:MIN:0.5:1:1440",
"RRA:MIN:0.5:30:336", "RRA:MIN:0.5:30:336",
"RRA:MIN:0.5:60:744", "RRA:MIN:0.5:60:744",
"RRA:MIN:0.5:1440:365", @min,
"RRA:MAX:0.5:1:1440", "RRA:MAX:0.5:1:1440",
"RRA:MAX:0.5:30:336", "RRA:MAX:0.5:30:336",
"RRA:MAX:0.5:60:744", "RRA:MAX:0.5:60:744",
"RRA:MAX:0.5:1440:365", @max,
"RRA:LAST:0.5:1:1440", "RRA:LAST:0.5:1:1440",
"RRA:LAST:0.5:30:336", "RRA:LAST:0.5:30:336",
"RRA:LAST:0.5:60:744", "RRA:LAST:0.5:60:744",
"RRA:LAST:0.5:1440:365", @last,
); );
}; };
my $err = RRDs::error; my $err = RRDs::error;