From 2702dc15e81637ac99e7bbb7b65bed7141b5884b Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Wed, 12 Mar 2008 10:39:18 +0100 Subject: [PATCH] Adopted patches and script to extractDS.px being renamed to rrd_filter.px. --- debian/patches/00list | 2 +- debian/patches/collection_conf_path.dpatch | 2 +- debian/patches/extractDS_path.dpatch | 41 --------------------- debian/patches/rrd_filter_path.dpatch | 43 ++++++++++++++++++++++ debian/rules | 2 +- 5 files changed, 46 insertions(+), 44 deletions(-) delete mode 100755 debian/patches/extractDS_path.dpatch create mode 100755 debian/patches/rrd_filter_path.dpatch diff --git a/debian/patches/00list b/debian/patches/00list index 1ebda45..332b35c 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,3 +1,3 @@ -extractDS_path.dpatch +rrd_filter_path.dpatch collection_conf_path.dpatch diff --git a/debian/patches/collection_conf_path.dpatch b/debian/patches/collection_conf_path.dpatch index c4f5b9b..bb0f3f9 100755 --- a/debian/patches/collection_conf_path.dpatch +++ b/debian/patches/collection_conf_path.dpatch @@ -1,5 +1,5 @@ #!/bin/sh /usr/share/dpatch/dpatch-run -## extractDS_path.dpatch by Sebastian Harl +## collection_conf_path.dpatch by Sebastian Harl ## ## DP: Set the path of collection.conf to /etc/collectd/. diff --git a/debian/patches/extractDS_path.dpatch b/debian/patches/extractDS_path.dpatch deleted file mode 100755 index 5c95cf1..0000000 --- a/debian/patches/extractDS_path.dpatch +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## extractDS_path.dpatch by Sebastian Harl -## -## DP: Set the path of extractDS.px to /usr/lib/collectd/utils/. - -@DPATCH@ - -diff a/contrib/migrate-3-4.px b/contrib/migrate-3-4.px ---- a/contrib/migrate-3-4.px -+++ b/contrib/migrate-3-4.px -@@ -165,7 +165,7 @@ for (@Files) - my $src_ds = $src_dses->[$i]; - $dest->{'type_instance'} = $type_instances->[$i]; - $dest_filename = get_filename ($dest); -- print "./extractDS.px -i '$InDir/$orig_filename' -s '$src_ds' -o '$OutDir/$dest_filename' -d '$dst_ds'\n"; -+ print "/usr/lib/collectd/utils/extractDS.px -i '$InDir/$orig_filename' -s '$src_ds' -o '$OutDir/$dest_filename' -d '$dst_ds'\n"; - } - } - elsif (exists ($TypeRename{$orig->{'type'}})) -@@ -360,17 +360,17 @@ sub special_disk - $OutDirs{$dest_directory} = 1; - } - -- print "./extractDS.px -i '$InDir/$orig_filename' -s 'rmerged' -s 'wmerged' -o '$OutDir/$dest_filename' -d 'read' -d 'write'\n"; -+ print "/usr/lib/collectd/utils/extractDS.px -i '$InDir/$orig_filename' -s 'rmerged' -s 'wmerged' -o '$OutDir/$dest_filename' -d 'read' -d 'write'\n"; - - $dest->{'type'} = 'disk_octets'; - $dest_filename = get_filename ($dest); -- print "./extractDS.px -i '$InDir/$orig_filename' -s 'rbytes' -s 'wbytes' -o '$OutDir/$dest_filename' -d 'read' -d 'write'\n"; -+ print "/usr/lib/collectd/utils/extractDS.px -i '$InDir/$orig_filename' -s 'rbytes' -s 'wbytes' -o '$OutDir/$dest_filename' -d 'read' -d 'write'\n"; - - $dest->{'type'} = 'disk_ops'; - $dest_filename = get_filename ($dest); -- print "./extractDS.px -i '$InDir/$orig_filename' -s 'rcount' -s 'wcount' -o '$OutDir/$dest_filename' -d 'read' -d 'write'\n"; -+ print "/usr/lib/collectd/utils/extractDS.px -i '$InDir/$orig_filename' -s 'rcount' -s 'wcount' -o '$OutDir/$dest_filename' -d 'read' -d 'write'\n"; - - $dest->{'type'} = 'disk_time'; - $dest_filename = get_filename ($dest); -- print "./extractDS.px -i '$InDir/$orig_filename' -s 'rtime' -s 'wtime' -o '$OutDir/$dest_filename' -d 'read' -d 'write'\n"; -+ print "/usr/lib/collectd/utils/extractDS.px -i '$InDir/$orig_filename' -s 'rtime' -s 'wtime' -o '$OutDir/$dest_filename' -d 'read' -d 'write'\n"; - } diff --git a/debian/patches/rrd_filter_path.dpatch b/debian/patches/rrd_filter_path.dpatch new file mode 100755 index 0000000..6d45ad7 --- /dev/null +++ b/debian/patches/rrd_filter_path.dpatch @@ -0,0 +1,43 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## rrd_filter_path.dpatch by Sebastian Harl +## +## DP: Set the path of rrd_filter.px to /usr/lib/collectd/utils/. + +@DPATCH@ + +diff a/contrib/migrate-3-4.px b/contrib/migrate-3-4.px +--- a/contrib/migrate-3-4.px ++++ b/contrib/migrate-3-4.px +@@ -166,7 +166,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"; + } + } + elsif (exists ($TypeRename{$orig->{'type'}})) +@@ -361,19 +361,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/debian/rules b/debian/rules index 9e16d99..83334b6 100755 --- a/debian/rules +++ b/debian/rules @@ -107,7 +107,7 @@ install-arch: build debian/collectd/etc/collectd/thresholds.conf mkdir -p debian/collectd/usr/lib/collectd/utils/ - for UTIL in extractDS.px migrate-3-4.px; do \ + for UTIL in rrd_filter.px migrate-3-4.px; do \ cp contrib/$$UTIL debian/collectd/usr/lib/collectd/utils/; \ done -- 2.30.2