projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.10' into collectd-5.0
[collectd.git]
/
contrib
/
migrate-4-5.px
diff --git
a/contrib/migrate-4-5.px
b/contrib/migrate-4-5.px
index
1e54683
..
d3ff796
100755
(executable)
--- a/
contrib/migrate-4-5.px
+++ b/
contrib/migrate-4-5.px
@@
-32,7
+32,6
@@
use Data::Dumper ();
use File::Basename ('dirname');
our $InDir = '/var/lib/collectd';
use File::Basename ('dirname');
our $InDir = '/var/lib/collectd';
-our $OutDir = '/tmp/collectd-5';
our $RRDtool = 'rrdtool';
our %TypesCounterToDerive = # {{{
our $RRDtool = 'rrdtool';
our %TypesCounterToDerive = # {{{
@@
-46,7
+45,6
@@
our %TypesCounterToDerive = # {{{
connections => ["value"],
cpu => ["value"],
current => ["value"],
connections => ["value"],
cpu => ["value"],
current => ["value"],
- df => ["used", "free"],
disk_merged => ["read", "write"],
disk_octets => ["read", "write"],
disk_ops => ["read", "write"],
disk_merged => ["read", "write"],
disk_octets => ["read", "write"],
disk_ops => ["read", "write"],
@@
-185,6
+183,7
@@
sub handle_file # {{{
&& (!$plugin_inst) && ($type_inst))
{
my $dir = join ('/', @path);
&& (!$plugin_inst) && ($type_inst))
{
my $dir = join ('/', @path);
+ print "mkdir -p \"$dir/$plugin-$type_inst\"\n";
print "mv \"$path\" \"$dir/$plugin-$type_inst/$type.rrd\"\n";
}
} # }}} sub handle_file
print "mv \"$path\" \"$dir/$plugin-$type_inst/$type.rrd\"\n";
}
} # }}} sub handle_file
@@
-226,8
+225,6
@@
Valid options are:
--indir <dir> Source directory
Default: $InDir
--indir <dir> Source directory
Default: $InDir
- --outdir <dir> Destination directory
- Default: $OutDir
--rrdtool <path> Path to the RRDtool binary
Default: $RRDtool
--rrdtool <path> Path to the RRDtool binary
Default: $RRDtool
@@
-236,7
+233,6
@@
EOF
} # }}} sub exit_usage
GetOptions ("indir|i=s" => \$InDir,
} # }}} sub exit_usage
GetOptions ("indir|i=s" => \$InDir,
- "outdir|o=s" => \$OutDir,
"rrdtool=s" => \$RRDtool,
"help|h" => \&exit_usage) or exit_usage ();
"rrdtool=s" => \$RRDtool,
"help|h" => \&exit_usage) or exit_usage ();