debian/patches/rrd_filter_path.dpatch

   1 #! /bin/sh /usr/share/dpatch/dpatch-run
   2 ## rrd_filter_path.dpatch by Sebastian Harl <sh@tokkee.org>
   3 ##
   4 ## DP: Set the path of rrd_filter.px to /usr/lib/collectd/utils/.
   5
   6 @DPATCH@
   7
   8 diff a/contrib/migrate-3-4.px b/contrib/migrate-3-4.px
   9 --- a/contrib/migrate-3-4.px
  10 +++ b/contrib/migrate-3-4.px
  11 @@ -166,7 +166,7 @@ for (@Files)
  12                         my $src_ds = $src_dses->[$i];
  13                         $dest->{'type_instance'} = $type_instances->[$i];
  14                         $dest_filename = get_filename ($dest);
  15 -                       print "./rrd_filter.px -i '$InDir/$orig_filename' -m '${src_ds}:${dst_ds}' -o '$OutDir/$dest_filename'\n";
  16 +                       print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m '${src_ds}:${dst_ds}' -o '$OutDir/$dest_filename'\n";
  17                 }
  18         }
  19         elsif (exists ($TypeRename{$orig->{'type'}}))
  20 @@ -361,19 +361,19 @@ sub special_disk
  21                 $OutDirs{$dest_directory} = 1;
  22         }
  23
  24 -       print "./rrd_filter.px -i '$InDir/$orig_filename' -m 'rmerged:read' -m 'wmerged:write' -o '$OutDir/$dest_filename'\n";
  25 +       print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m 'rmerged:read' -m 'wmerged:write' -o '$OutDir/$dest_filename'\n";
  26
  27         $dest->{'type'} = 'disk_octets';
  28         $dest_filename = get_filename ($dest);
  29 -       print "./rrd_filter.px -i '$InDir/$orig_filename' -m 'rbytes:read' -m 'wbytes:write' -o '$OutDir/$dest_filename'\n";
  30 +       print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m 'rbytes:read' -m 'wbytes:write' -o '$OutDir/$dest_filename'\n";
  31
  32         $dest->{'type'} = 'disk_ops';
  33         $dest_filename = get_filename ($dest);
  34 -       print "./rrd_filter.px -i '$InDir/$orig_filename' -m 'rcount:read' -m 'wcount:write' -o '$OutDir/$dest_filename'\n";
  35 +       print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m 'rcount:read' -m 'wcount:write' -o '$OutDir/$dest_filename'\n";
  36
  37         $dest->{'type'} = 'disk_time';
  38         $dest_filename = get_filename ($dest);
  39 -       print "./rrd_filter.px -i '$InDir/$orig_filename' -m 'rtime:read' -m 'wtime:write' -o '$OutDir/$dest_filename'\n";
  40 +       print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m 'rtime:read' -m 'wtime:write' -o '$OutDir/$dest_filename'\n";
  41  }
  42
  43  sub exit_usage
  44 diff a/contrib/migrate-4-5.px b/contrib/migrate-4-5.px
  45 --- a/contrib/migrate-4-5.px
  46 +++ b/contrib/migrate-4-5.px
  47 @@ -32,8 +32,8 @@
  48  use File::Basename ('dirname');
  49
  50  our $InDir = '/var/lib/collectd';
  51 -our $RRDtool = 'rrdtool';
  52 -our $RRDFilter = 'rrd_filter.px';
  53 +our $RRDtool = '/usr/bin/rrdtool';
  54 +our $RRDFilter = '/usr/lib/collectd/utils/rrd_filter.px';
  55
  56  our %TypesCounterToDerive = # {{{
  57  (