2
0
mirror of https://github.com/munin-monitoring/contrib.git synced 2018-11-08 00:59:34 +01:00

Merge pull request #915 from Talkless/patch-1

Fix du-2 to use clean_fieldname()
This commit is contained in:
sumpfralle 2018-03-28 20:37:23 +02:00 committed by GitHub
commit f7158706a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -91,12 +91,12 @@ if( (defined $ARGV[0]) && ($ARGV[0] eq "config") ) {
while(defined (my $bar = <FILE>)) {
if ($bar =~ m/(\d+)\s+(.+)/) {
my $dir = $2;
clean_path(\$dir);
print "$dir.label $dir\n";
my $clean_dir = clean_fieldname($dir);
print "$clean_dir.label $dir\n";
if ($foo++) {
print "$dir.draw STACK\n";
print "$clean_dir.draw STACK\n";
} else {
print "$dir.draw AREA\n";
print "$clean_dir.draw AREA\n";
}
}
}
@ -110,8 +110,7 @@ open (FILE, "<", $CACHEFILE) or munin_exit_fail();
while(defined (my $foo = <FILE>)) {
if ($foo =~ m/(\d+)\s+(.+)/) {
my ($field, $value) = ($2, $1);
clean_path(\$field);
print $field, ".value ", $value, "\n";
print clean_fieldname($field), ".value ", $value, "\n";
}
}
close(FILE);