From 725d9041313d82f2ec75c8977ba33e49dc494719 Mon Sep 17 00:00:00 2001 From: Christopher Desjardins Date: Thu, 20 Sep 2018 12:05:01 +0200 Subject: [PATCH 1/2] Add clean_path back, it got dropped when clean_fieldname was added This allows you to tidy up your munin dir stats --- plugins/disk/du-2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/disk/du-2 b/plugins/disk/du-2 index 6b8dfddc..de739d51 100755 --- a/plugins/disk/du-2 +++ b/plugins/disk/du-2 @@ -91,6 +91,7 @@ if( (defined $ARGV[0]) && ($ARGV[0] eq "config") ) { while(defined (my $bar = )) { if ($bar =~ m/(\d+)\s+(.+)/) { my $dir = $2; + clean_path(\$dir); my $clean_dir = clean_fieldname($dir); print "$clean_dir.label $dir\n"; if ($foo++) { @@ -110,6 +111,7 @@ open (FILE, "<", $CACHEFILE) or munin_exit_fail(); while(defined (my $foo = )) { if ($foo =~ m/(\d+)\s+(.+)/) { my ($field, $value) = ($2, $1); + clean_path(\$field); print clean_fieldname($field), ".value ", $value, "\n"; } } From a5ed119b6ed2d83607bcd32884f942116d9cc2b5 Mon Sep 17 00:00:00 2001 From: Christopher Desjardins Date: Thu, 20 Sep 2018 12:06:05 +0200 Subject: [PATCH 2/2] Add sort to the du command to keep things in order of size --- plugins/disk/du-2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/disk/du-2 b/plugins/disk/du-2 index de739d51..3dc5e610 100755 --- a/plugins/disk/du-2 +++ b/plugins/disk/du-2 @@ -134,7 +134,7 @@ sub daemonize { ## In the child, let's get the du infos if necessary if (cache_is_too_old() && du_not_running()) { my $dirs = $ENV{dirs}; - system("touch $LOCKFILE; du -sb $dirs > $TEMPFILE; cat $TEMPFILE > $CACHEFILE; rm $LOCKFILE; date +%s > $TIMEFILE;"); + system("touch $LOCKFILE; du -sb $dirs | sort -n -r > $TEMPFILE; cat $TEMPFILE > $CACHEFILE; rm $LOCKFILE; date +%s > $TIMEFILE;"); } exit; } ## daemonize