X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=contrib%2Fmigrate-3-4.px;h=ed19a7b61535265f11c6423fd1154d867735bd7c;hp=673929cc086faee9ca40db640a49ad0dfd33be03;hb=2bc8f11d9c7182e24fb62a6efefa3e0b74ac0afb;hpb=3469385f04ffcfa2f4ef06d34ed4b24acb378b34

diff --git a/contrib/migrate-3-4.px b/contrib/migrate-3-4.px
index 673929cc..ed19a7b6 100755
--- a/contrib/migrate-3-4.px
+++ b/contrib/migrate-3-4.px
@@ -121,7 +121,8 @@ our %TypeSplit =
 
 our %TypeRename =
 (
-	traffic => { from => [qw(incoming outgoing)], to => [qw(rx tx)] }
+	traffic => { from => [qw(incoming outgoing)], to => [qw(rx tx)] },
+	vs_processes => { from => [qw(total)], to => [qw(value)] },
 );
 
 GetOptions ("indir|i=s" => \$InDir,
@@ -169,22 +170,23 @@ for (@Files)
 			print "./rrd_filter.px -i '$InDir/$orig_filename' -m '${src_ds}:${dst_ds}' -o '$OutDir/$dest_filename'\n";
 		}
 	}
-	elsif (exists ($TypeRename{$orig->{'type'}}))
+	else
+	{
+		print "cp '$InDir/$orig_filename' '$OutDir/$dest_filename'\n";
+	}
+
+	if (exists ($TypeRename{$orig->{'type'}}))
 	{
 		my $src_dses = $TypeRename{$orig->{'type'}}->{'from'};
 		my $dst_dses = $TypeRename{$orig->{'type'}}->{'to'};
-		my @sed_prog = ();
 
+		print "rrdtool tune '$OutDir/$dest_filename'";
 		for (my $i = 0; $i < @$src_dses; $i++)
 		{
-			push (@sed_prog, 's/^' . $src_dses->[$i] . '$/' . $dst_dses->[$i] . '/g;');
+			print " --data-source-rename "
+				. $src_dses->[$i] . ':' . $dst_dses->[$i];
 		}
-
-		print "rrdtool dump '$InDir/$orig_filename' | sed -e '" . join (' ', @sed_prog) . "' | rrdtool restore - '$OutDir/$dest_filename'\n";
-	}
-	else
-	{
-		print "cp '$InDir/$orig_filename' '$OutDir/$dest_filename'\n";
+		print "\n";
 	}
 }