1 Author: Sebastian Harl <sh@tokkee.org>
2 Description: Set the path of rrd_filter.px to /usr/lib/collectd/utils/.
3 --- a/contrib/migrate-3-4.px
4 +++ b/contrib/migrate-3-4.px
5 @@ -167,7 +167,7 @@
6 my $src_ds = $src_dses->[$i];
7 $dest->{'type_instance'} = $type_instances->[$i];
8 $dest_filename = get_filename ($dest);
9 - print "./rrd_filter.px -i '$InDir/$orig_filename' -m '${src_ds}:${dst_ds}' -o '$OutDir/$dest_filename'\n";
10 + print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m '${src_ds}:${dst_ds}' -o '$OutDir/$dest_filename'\n";
11 }
12 }
13 else
14 @@ -363,19 +363,19 @@
15 $OutDirs{$dest_directory} = 1;
16 }
18 - print "./rrd_filter.px -i '$InDir/$orig_filename' -m 'rmerged:read' -m 'wmerged:write' -o '$OutDir/$dest_filename'\n";
19 + print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m 'rmerged:read' -m 'wmerged:write' -o '$OutDir/$dest_filename'\n";
21 $dest->{'type'} = 'disk_octets';
22 $dest_filename = get_filename ($dest);
23 - print "./rrd_filter.px -i '$InDir/$orig_filename' -m 'rbytes:read' -m 'wbytes:write' -o '$OutDir/$dest_filename'\n";
24 + print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m 'rbytes:read' -m 'wbytes:write' -o '$OutDir/$dest_filename'\n";
26 $dest->{'type'} = 'disk_ops';
27 $dest_filename = get_filename ($dest);
28 - print "./rrd_filter.px -i '$InDir/$orig_filename' -m 'rcount:read' -m 'wcount:write' -o '$OutDir/$dest_filename'\n";
29 + print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m 'rcount:read' -m 'wcount:write' -o '$OutDir/$dest_filename'\n";
31 $dest->{'type'} = 'disk_time';
32 $dest_filename = get_filename ($dest);
33 - print "./rrd_filter.px -i '$InDir/$orig_filename' -m 'rtime:read' -m 'wtime:write' -o '$OutDir/$dest_filename'\n";
34 + print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m 'rtime:read' -m 'wtime:write' -o '$OutDir/$dest_filename'\n";
35 }
37 sub exit_usage
38 --- a/contrib/migrate-4-5.px
39 +++ b/contrib/migrate-4-5.px
40 @@ -32,8 +32,8 @@
41 use File::Basename ('dirname');
43 our $InDir = '/var/lib/collectd';
44 -our $RRDtool = 'rrdtool';
45 -our $RRDFilter = 'rrd_filter.px';
46 +our $RRDtool = '/usr/bin/rrdtool';
47 +our $RRDFilter = '/usr/lib/collectd/utils/rrd_filter.px';
49 our %TypesCounterToDerive = # {{{
50 (