Merge branch 'collectd-4.2'

[collectd.git] / contrib / migrate-3-4.px

diff --git a/contrib/migrate-3-4.px b/contrib/migrate-3-4.px
index 24a3c4e..e50c0cd 100755 (executable)
--- a/contrib/migrate-3-4.px
+++ b/contrib/migrate-3-4.px
@@ -95,6 +95,7 @@ our %Subdirs =
 our %TypeTranslate =
 (
        cpu => sub { $_ = shift; $_->{'plugin_instance'} = $_->{'type_instance'}; $_->{'type_instance'} = undef; $_; },
+       hddtemp => sub { $_ = shift; $_->{'plugin'} = 'hddtemp'; $_->{'type'} = 'temperature'; $_->{'type_instance'} = _special_disk_instance ($_->{'type_instance'}); $_; },
        if_errors => sub { $_ = shift; $_->{'type_instance'} = $_->{'plugin_instance'}; $_->{'plugin_instance'} = undef; $_; },
        if_packets => sub { $_ = shift; $_->{'type_instance'} = $_->{'plugin_instance'}; $_->{'plugin_instance'} = undef; $_; },
        nfs2_procedures => sub { $_ = shift; @$_{qw(plugin plugin_instance type type_instance)} = ('nfs', 'v2' . $_->{'type_instance'}, 'nfs_procedure', undef); $_; },
@@ -125,14 +126,9 @@ our %TypeRename =
 
 GetOptions ("indir|i=s" => \$InDir,
        "outdir|o=s" => \$OutDir,
-       "hostname=s" => \$Hostname) or exit (1);
+       "hostname=s" => \$Hostname) or exit_usage ();
 
 die "No such directory: $InDir" if (!-d $InDir);
-if (!-e $OutDir)
-{
-       mkdir ($OutDir) or die ("mkdir ($OutDir): $!");
-}
-die "Not a directory: $OutDir" if (!-d $OutDir);
 
 our @Files = ();
 our %OutDirs = ();
@@ -346,6 +342,7 @@ sub special_disk
        my $orig = shift;
        my $dest_filename = shift;
        my $dest = shift;
+       my $dest_directory;
 
        $dest->{'type_instance'} = undef;
        $dest->{'plugin_instance'} = _special_disk_instance ($orig->{'type_instance'});
@@ -356,6 +353,14 @@ sub special_disk
 
        $dest->{'type'} = 'disk_merged';
        $dest_filename = get_filename ($dest);
+
+       $dest_directory = dirname ($dest_filename);
+       if (!exists ($OutDirs{$dest_directory}))
+       {
+               print "[ -d '$OutDir/$dest_directory' ] || mkdir -p '$OutDir/$dest_directory'\n";
+               $OutDirs{$dest_directory} = 1;
+       }
+
        print "./extractDS.px -i '$InDir/$orig_filename' -s 'rmerged' -s 'wmerged' -o '$OutDir/$dest_filename' -d 'read' -d 'write'\n";
 
        $dest->{'type'} = 'disk_octets';
@@ -370,3 +375,11 @@ sub special_disk
        $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";
 }
+
+sub exit_usage
+{
+       print <<EOF;
+Usage: $0 [-i indir] [-o outdir] [--hostname myhostname]
+EOF
+       exit (1);
+}