projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3339 from jkohen/patch-1
[collectd.git]
/
contrib
/
migrate-4-5.px
diff --git
a/contrib/migrate-4-5.px
b/contrib/migrate-4-5.px
index
d3ff796
..
8e5a7ed
100755
(executable)
--- a/
contrib/migrate-4-5.px
+++ b/
contrib/migrate-4-5.px
@@
-33,6
+33,7
@@
use File::Basename ('dirname');
our $InDir = '/var/lib/collectd';
our $RRDtool = 'rrdtool';
our $InDir = '/var/lib/collectd';
our $RRDtool = 'rrdtool';
+our $RRDFilter = 'rrd_filter.px';
our %TypesCounterToDerive = # {{{
(
our %TypesCounterToDerive = # {{{
(
@@
-103,8
+104,6
@@
our %TypesCounterToDerive = # {{{
protocol_counter => ["value"],
ps_cputime => ["user", "syst"],
ps_pagefaults => ["minflt", "majflt"],
protocol_counter => ["value"],
ps_cputime => ["user", "syst"],
ps_pagefaults => ["minflt", "majflt"],
- ps_code => ["value"],
- ps_data => ["value"],
serial_octets => ["rx", "tx"],
swap_io => ["value"],
virt_cpu_total => ["ns"],
serial_octets => ["rx", "tx"],
swap_io => ["value"],
virt_cpu_total => ["ns"],
@@
-184,7
+183,15
@@
sub handle_file # {{{
{
my $dir = join ('/', @path);
print "mkdir -p \"$dir/$plugin-$type_inst\"\n";
{
my $dir = join ('/', @path);
print "mkdir -p \"$dir/$plugin-$type_inst\"\n";
- print "mv \"$path\" \"$dir/$plugin-$type_inst/$type.rrd\"\n";
+ if (($plugin eq 'df') and ($type eq 'df'))
+ {
+ print "$RRDFilter --infile=\"$path\" --outfile=\"$dir/$plugin-$type_inst/df_complex-free.rrd\" --map free:value\n";
+ print "$RRDFilter --infile=\"$path\" --outfile=\"$dir/$plugin-$type_inst/df_complex-used.rrd\" --map used:value\n";
+ }
+ else
+ {
+ print "mv \"$path\" \"$dir/$plugin-$type_inst/$type.rrd\"\n";
+ }
}
} # }}} sub handle_file
}
} # }}} sub handle_file
@@
-223,10
+230,12
@@
migrate-4-5.px [OPTIONS]
Valid options are:
Valid options are:
- --indir <dir> Source directory
- Default: $InDir
- --rrdtool <path> Path to the RRDtool binary
- Default: $RRDtool
+ --indir <dir> Source directory
+ Default: $InDir
+ --rrdtool <path> Path to the RRDtool binary
+ Default: $RRDtool
+ --rrdfilter <path> Path to the rrd_filter.px script
+ Default: $RRDFilter
EOF
exit (1);
EOF
exit (1);
@@
-234,8
+243,11
@@
EOF
GetOptions ("indir|i=s" => \$InDir,
"rrdtool=s" => \$RRDtool,
GetOptions ("indir|i=s" => \$InDir,
"rrdtool=s" => \$RRDtool,
+ "rrdfilter=s" => \$RRDFilter,
"help|h" => \&exit_usage) or exit_usage ();
"help|h" => \&exit_usage) or exit_usage ();
+print "#!/bin/bash\n\n";
+
scan_dir ($InDir);
# vim: set sw=2 sts=2 et fdm=marker :
scan_dir ($InDir);
# vim: set sw=2 sts=2 et fdm=marker :