Set the path of rrd_filter.px to /usr/lib/collectd/utils/.

===================================================================

Gbp-Pq: Name rrd_filter_path.patch

diff --git a/contrib/migrate-3-4.px b/contrib/migrate-3-4.px
index ed19a7b61535265f11c6423fd1154d867735bd7c..5912e47504345f551ee3b77f3514963d73fe37cb 100755 (executable)
--- a/contrib/migrate-3-4.px
+++ b/contrib/migrate-3-4.px
@@ -167,7 +167,7 @@ for (@Files)
                        my $src_ds = $src_dses->[$i];
                        $dest->{'type_instance'} = $type_instances->[$i];
                        $dest_filename = get_filename ($dest);
-                       print "./rrd_filter.px -i '$InDir/$orig_filename' -m '${src_ds}:${dst_ds}' -o '$OutDir/$dest_filename'\n";
+                       print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m '${src_ds}:${dst_ds}' -o '$OutDir/$dest_filename'\n";
                }
        }
        else
@@ -363,19 +363,19 @@ sub special_disk
                $OutDirs{$dest_directory} = 1;
        }
 
-       print "./rrd_filter.px -i '$InDir/$orig_filename' -m 'rmerged:read' -m 'wmerged:write' -o '$OutDir/$dest_filename'\n";
+       print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m 'rmerged:read' -m 'wmerged:write' -o '$OutDir/$dest_filename'\n";
 
        $dest->{'type'} = 'disk_octets';
        $dest_filename = get_filename ($dest);
-       print "./rrd_filter.px -i '$InDir/$orig_filename' -m 'rbytes:read' -m 'wbytes:write' -o '$OutDir/$dest_filename'\n";
+       print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m 'rbytes:read' -m 'wbytes:write' -o '$OutDir/$dest_filename'\n";
 
        $dest->{'type'} = 'disk_ops';
        $dest_filename = get_filename ($dest);
-       print "./rrd_filter.px -i '$InDir/$orig_filename' -m 'rcount:read' -m 'wcount:write' -o '$OutDir/$dest_filename'\n";
+       print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m 'rcount:read' -m 'wcount:write' -o '$OutDir/$dest_filename'\n";
 
        $dest->{'type'} = 'disk_time';
        $dest_filename = get_filename ($dest);
-       print "./rrd_filter.px -i '$InDir/$orig_filename' -m 'rtime:read' -m 'wtime:write' -o '$OutDir/$dest_filename'\n";
+       print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m 'rtime:read' -m 'wtime:write' -o '$OutDir/$dest_filename'\n";
 }
 
 sub exit_usage

diff --git a/contrib/migrate-4-5.px b/contrib/migrate-4-5.px
index 8e5a7ed44be9459cf69415e50f46664c483f8aa4..73bb6003f88b6a49a00d7cdad40bef83a6a45161 100755 (executable)
--- a/contrib/migrate-4-5.px
+++ b/contrib/migrate-4-5.px
@@ -32,8 +32,8 @@ use Data::Dumper ();
 use File::Basename ('dirname');
 
 our $InDir = '/var/lib/collectd';
-our $RRDtool = 'rrdtool';
-our $RRDFilter = 'rrd_filter.px';
+our $RRDtool = '/usr/bin/rrdtool';
+our $RRDFilter = '/usr/lib/collectd/utils/rrd_filter.px';
 
 our %TypesCounterToDerive = # {{{
 (