Merge lp:~percona-toolkit-dev/percona-toolkit/release-2.2.8 into lp:percona-toolkit/2.2

[Daniel Nichter]

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'Changelog'
--- Changelog	2014-02-20 08:10:16 +0000
+++ Changelog	2014-05-30 01:02:37 +0000
@@ -1,5 +1,15 @@
 Changelog for Percona Toolkit
 
+  * Removed pt-agent
+  * Added pt-slave-restart GTID support
+  * Added pt-table-checksum --plugin
+  * Fixed bug 1304062: --ignore-tables does not work correctly
+  * Fixed bug 1295667: pt-deadlock-logger logs incorrect ts
+  * Fixed bug 1254233: pt-mysql-summary blank InnoDB section for 5.6
+  * Fixed bug 1286250: pt-online-schema-change requests password twice
+  * Fixed bug  965553: pt-query-digest dosn't fingerprint true/false literals correctly
+  * Fixed bug  290911: pt-show-grant --ask-pass prints "Enter password" to STDOUT
+
 v2.2.7 released 2014-02-20
 
   * Fixed bug 1279502: --version-check behaves like spyware

=== renamed file 'bin/pt-agent' => 'bin/pt-agent.THIS'
=== modified file 'bin/pt-archiver'
--- bin/pt-archiver	2014-05-24 21:36:33 +0000
+++ bin/pt-archiver	2014-05-30 01:02:37 +0000
@@ -43,7 +43,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.7';
+our $VERSION = '2.2.8';
 
 use strict;
 use warnings FATAL => 'all';

=== modified file 'bin/pt-config-diff'
--- bin/pt-config-diff	2014-05-24 21:36:33 +0000
+++ bin/pt-config-diff	2014-05-30 01:02:37 +0000
@@ -43,7 +43,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.7';
+our $VERSION = '2.2.8';
 
 use strict;
 use warnings FATAL => 'all';

=== modified file 'bin/pt-deadlock-logger'
--- bin/pt-deadlock-logger	2014-05-24 21:36:33 +0000
+++ bin/pt-deadlock-logger	2014-05-30 01:02:37 +0000
@@ -42,7 +42,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.7';
+our $VERSION = '2.2.8';
 
 use strict;
 use warnings FATAL => 'all';
@@ -4440,12 +4440,27 @@
 
    my $dst;
    if ( my $dst_dsn = $o->get('dest') ) {
+
+      # set time_zone = SYSTEM , addresses https://bugs.launchpad.net/percona-toolkit/+bug/1295667
+      my $set_tz  = sub {
+         my ($dbh) = @_;
+         my $sql = "SET time_zone=SYSTEM /* pt-deadlock-logger */";
+         eval {
+            PTDEBUG && _d($dbh, $sql);
+            $dbh->do($sql);
+         };
+         if ( $EVAL_ERROR ) {
+            die "Failed to $sql: $EVAL_ERROR\n";   
+         }
+      };
+      
       $dst = Cxn->new(
          dsn          => $dst_dsn,
          prev_dsn     => ($src ? $src->dsn : undef),
          parent       => $o->get('daemonize'),
          DSNParser    => $dp,
          OptionParser => $o,
+         set          => $set_tz,
       );
    }
 
@@ -5199,7 +5214,7 @@
 
  CREATE TABLE deadlocks (
    server char(20) NOT NULL,
-   ts datetime NOT NULL,
+   ts timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
    thread int unsigned NOT NULL,
    txn_id bigint unsigned NOT NULL,
    txn_time smallint unsigned NOT NULL,

=== modified file 'bin/pt-diskstats'
--- bin/pt-diskstats	2014-05-24 21:36:33 +0000
+++ bin/pt-diskstats	2014-05-30 01:02:37 +0000
@@ -38,7 +38,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.7';
+our $VERSION = '2.2.8';
 
 use strict;
 use warnings FATAL => 'all';

=== modified file 'bin/pt-duplicate-key-checker'
--- bin/pt-duplicate-key-checker	2014-05-28 01:15:25 +0000
+++ bin/pt-duplicate-key-checker	2014-05-30 01:02:37 +0000
@@ -39,7 +39,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.7';
+our $VERSION = '2.2.8';
 
 use strict;
 use warnings FATAL => 'all';

=== modified file 'bin/pt-find'
--- bin/pt-find	2014-05-24 21:36:33 +0000
+++ bin/pt-find	2014-05-30 01:02:37 +0000
@@ -35,7 +35,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.7';
+our $VERSION = '2.2.8';
 
 use strict;
 use warnings FATAL => 'all';

=== modified file 'bin/pt-fk-error-logger'
--- bin/pt-fk-error-logger	2014-05-24 21:36:33 +0000
+++ bin/pt-fk-error-logger	2014-05-30 01:02:37 +0000
@@ -37,7 +37,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.7';
+our $VERSION = '2.2.8';
 
 use strict;
 use warnings FATAL => 'all';

=== modified file 'bin/pt-heartbeat'
--- bin/pt-heartbeat	2014-05-24 21:36:33 +0000
+++ bin/pt-heartbeat	2014-05-30 01:02:37 +0000
@@ -38,7 +38,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.7';
+our $VERSION = '2.2.8';
 
 use strict;
 use warnings FATAL => 'all';

=== modified file 'bin/pt-index-usage'
--- bin/pt-index-usage	2014-05-28 17:03:30 +0000
+++ bin/pt-index-usage	2014-05-30 01:02:37 +0000
@@ -45,7 +45,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.7';
+our $VERSION = '2.2.8';
 
 use strict;
 use warnings FATAL => 'all';

=== modified file 'bin/pt-kill'
--- bin/pt-kill	2014-05-28 17:03:30 +0000
+++ bin/pt-kill	2014-05-30 01:02:37 +0000
@@ -47,7 +47,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.7';
+our $VERSION = '2.2.8';
 
 use strict;
 use warnings FATAL => 'all';

=== modified file 'bin/pt-online-schema-change'
--- bin/pt-online-schema-change	2014-05-24 21:36:33 +0000
+++ bin/pt-online-schema-change	2014-05-30 01:02:37 +0000
@@ -54,7 +54,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.7';
+our $VERSION = '2.2.8';
 
 use strict;
 use warnings FATAL => 'all';
@@ -3771,7 +3771,7 @@
 
    my $dbh = $self->{dbh};
    if ( !$dbh || !$dbh->ping() ) {
-      if ( $self->{ask_pass} && !$self->{asked_for_pass} ) {
+      if ( $self->{ask_pass} && !$self->{asked_for_pass} && !defined $dsn->{p}) {
          $dsn->{p} = OptionParser::prompt_noecho("Enter MySQL password: ");
          $self->{asked_for_pass} = 1;
       }
@@ -8105,21 +8105,29 @@
          return;
       };
 
-      my $get_lag = sub {
-         my ($cxn) = @_;
-         my $dbh = $cxn->dbh();
-         if ( !$dbh || !$dbh->ping() ) {
-            eval { $dbh = $cxn->connect() };  # connect or die trying
-            if ( $EVAL_ERROR ) {
-               $oktorun = 0;  # flag for cleanup tasks
-               chomp $EVAL_ERROR;
-               die "Lost connection to replica " . $cxn->name()
-                  . " while attempting to get its lag ($EVAL_ERROR)\n";
+      my $get_lag;
+      # The plugin is able to override the slavelag check so tools like 
+      # pt-heartbeat or other replicators (Tungsten...) can be used to 
+      # measure replication lag
+      if ( $plugin && $plugin->can('get_slave_lag') ) {
+         $get_lag = $plugin->get_slave_lag(oktorun => \$oktorun);
+      } else {      
+         $get_lag = sub {
+            my ($cxn) = @_;
+            my $dbh = $cxn->dbh();
+            if ( !$dbh || !$dbh->ping() ) {
+               eval { $dbh = $cxn->connect() };  # connect or die trying
+               if ( $EVAL_ERROR ) {
+                  $oktorun = 0;  # flag for cleanup tasks
+                  chomp $EVAL_ERROR;
+                  die "Lost connection to replica " . $cxn->name()
+                     . " while attempting to get its lag ($EVAL_ERROR)\n";
+               }
             }
-         }
-         return $ms->get_slave_lag($dbh);
-      };
-
+            return $ms->get_slave_lag($dbh);
+         };
+      }
+      
       $replica_lag = new ReplicaLagWaiter(
          slaves   => $slave_lag_cxns,
          max_lag  => $o->get('max-lag'),
@@ -11345,6 +11353,7 @@
    after_drop_old_table
    before_drop_triggers
    before_exit
+   get_slave_lag
 
 Each hook is passed different arguments.  To see which arguments are passed
 to a hook, search for the hook's name in the tool's source code, like:

=== modified file 'bin/pt-query-digest'
--- bin/pt-query-digest	2014-05-28 17:03:30 +0000
+++ bin/pt-query-digest	2014-05-30 01:02:37 +0000
@@ -64,7 +64,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.7';
+our $VERSION = '2.2.8';
 
 use strict;
 use warnings FATAL => 'all';

=== modified file 'bin/pt-slave-delay'
--- bin/pt-slave-delay	2014-05-24 21:36:33 +0000
+++ bin/pt-slave-delay	2014-05-30 01:02:37 +0000
@@ -40,7 +40,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.7';
+our $VERSION = '2.2.8';
 
 use strict;
 use warnings FATAL => 'all';

=== modified file 'bin/pt-slave-restart'
--- bin/pt-slave-restart	2014-05-28 22:25:08 +0000
+++ bin/pt-slave-restart	2014-05-30 01:02:37 +0000
@@ -41,7 +41,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.7';
+our $VERSION = '2.2.8';
 
 use strict;
 use warnings FATAL => 'all';

=== modified file 'bin/pt-table-checksum'
--- bin/pt-table-checksum	2014-05-28 01:15:25 +0000
+++ bin/pt-table-checksum	2014-05-30 01:02:37 +0000
@@ -57,7 +57,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.7';
+our $VERSION = '2.2.8';
 
 use strict;
 use warnings FATAL => 'all';
@@ -9222,6 +9222,30 @@
    my $slaves = [];    # all slaves (that we can find)
    my $slave_lag_cxns; # slaves whose lag we'll check
 
+   # ########################################################################
+   # Create --plugin.
+   # ########################################################################   
+   my $plugin;
+   if ( my $file = $o->get('plugin') ) {
+      die "--plugin file $file does not exist\n" unless -f $file;
+      eval {
+         require $file;
+      };
+      die "Error loading --plugin $file: $EVAL_ERROR" if $EVAL_ERROR;
+      eval {
+         $plugin = pt_table_checksum_plugin->new(
+            master_cxn  => $master_cxn,
+            explain     => $o->get('explain'),
+            quiet       => $o->get('quiet'),
+            resume      => $o->get('resume'),
+            Quoter      => $q,
+            TableParser => $tp,
+         );
+      };
+      die "Error creating --plugin: $EVAL_ERROR" if $EVAL_ERROR;
+      print "Created plugin from $file.\n";
+   }
+
    my $replica_lag;    # ReplicaLagWaiter object
    my $replica_lag_pr; # Progress for ReplicaLagWaiter
    my $sys_load;       # MySQLStatusWaiter object
@@ -9446,6 +9470,11 @@
       # #####################################################################
       if ( $o->get('replicate-check') && $o->get('replicate-check-only') ) {
          PTDEBUG && _d('Will --replicate-check and exit');
+      
+         # --plugin hook
+         if ( $plugin && $plugin->can('before_replicate_check') ) {
+            $plugin->before_replicate_check();
+         }
 
          foreach my $slave ( @$slaves ) {
             my $diffs = $rc->find_replication_differences(
@@ -9466,6 +9495,11 @@
             }
          }
 
+         # --plugin hook
+         if ( $plugin && $plugin->can('after_replicate_check') ) {
+            $plugin->after_replicate_check();
+         }
+
          PTDEBUG && _d('Exit status', $exit_status, 'oktorun', $oktorun);
          return $exit_status;
       }
@@ -9544,23 +9578,31 @@
          return;
       };
 
-      my $get_lag = sub {
-         my ($cxn) = @_;
-         my $dbh = $cxn->dbh();
-         if ( !$dbh || !$dbh->ping() ) {
-            PTDEBUG && _d('Lost connection to slave', $cxn->name(),
-               'while waiting for slave lag');
-            eval { $dbh = $cxn->connect() };  # connect or die trying
-            if ( $EVAL_ERROR ) {
-               $oktorun = 0;  # Fatal error
-               chomp $EVAL_ERROR;
-               die "Lost connection to replica " . $cxn->name()
-                  . " while attempting to get its lag ($EVAL_ERROR)";
+      my $get_lag;
+      # The plugin is able to override the slavelag check so tools like 
+      # pt-heartbeat or other replicators (Tungsten...) can be used to 
+      # measure replication lag
+      if ( $plugin && $plugin->can('get_slave_lag') ) {
+         $get_lag = $plugin->get_slave_lag(oktorun => \$oktorun);
+      } else {
+         $get_lag = sub {
+            my ($cxn) = @_;
+            my $dbh = $cxn->dbh();
+            if ( !$dbh || !$dbh->ping() ) {
+               PTDEBUG && _d('Lost connection to slave', $cxn->name(),
+                  'while waiting for slave lag');
+               eval { $dbh = $cxn->connect() };  # connect or die trying
+               if ( $EVAL_ERROR ) {
+                  $oktorun = 0;  # Fatal error
+                  chomp $EVAL_ERROR;
+                  die "Lost connection to replica " . $cxn->name()
+                     . " while attempting to get its lag ($EVAL_ERROR)";
+               }
             }
-         }
-         return $ms->get_slave_lag($dbh);
-      };
-
+            return $ms->get_slave_lag($dbh);
+         };
+      }
+      
       $replica_lag = new ReplicaLagWaiter(
          slaves   => $slave_lag_cxns,
          max_lag  => $o->get('max-lag'),
@@ -10168,6 +10210,19 @@
    };
 
    # ########################################################################
+   # Init the --plugin.
+   # ########################################################################   
+
+   # --plugin hook
+   if ( $plugin && $plugin->can('init') ) {
+      $plugin->init(
+         slaves         => $slaves,
+         slave_lag_cxns => $slave_lag_cxns,
+         repl_table     => $repl_table,
+      );
+   }
+
+   # ########################################################################
    # Checksum each table.
    # ########################################################################
 
@@ -10271,6 +10326,12 @@
                              @$all_cols;
             $tbl->{checksum_cols} = \@cols;
 
+            # --plugin hook
+            if ( $plugin && $plugin->can('before_checksum_table') ) {
+               $plugin->before_checksum_table(
+                  tbl   => $tbl);
+            }
+
             # Finally, checksum the table.
             # The "1 while" loop is necessary because we're executing REPLACE
             # statements which don't return rows and NibbleIterator only
@@ -10279,6 +10340,11 @@
             # from the done callback, uses this start time.
             $tbl->{checksum_results}->{start_time} = time;
             1 while $nibble_iter->next();
+            
+            # --plugin hook
+            if ( $plugin && $plugin->can('after_checksum_table') ) {
+               $plugin->after_checksum_table();
+            }
          }
       };
       if ( $EVAL_ERROR ) {
@@ -12053,6 +12119,18 @@
 tool will overwrite the PID file with the current PID.  The PID file is
 removed automatically when the tool exits.
 
+=item --plugin
+
+type: string
+
+Perl module file that defines a C<pt_table_checksum_plugin> class.
+A plugin allows you to write a Perl module that can hook into many parts
+of pt-table-checksum.  This requires a good knowledge of Perl and
+Percona Toolkit conventions, which are beyond this scope of this
+documentation.  Please contact Percona if you have questions or need help.
+
+See L<"PLUGIN"> for more information.
+
 =item --port
 
 short form: -P; type: int; group: Connection
@@ -12401,6 +12479,39 @@
 
 =back
 
+=head1 PLUGIN
+
+The file specified by L<"--plugin"> must define a class (i.e. a package)
+called C<pt_table_checksum_plugin> with a C<new()> subroutine.
+The tool will create an instance of this class and call any hooks that
+it defines.  No hooks are required, but a plugin isn't very useful without
+them.
+
+These hooks, in this order, are called if defined:
+
+   init
+   before_replicate_check
+   after_replicate_check
+   get_slave_lag
+   before_checksum_table
+   after_checksum_table
+
+Each hook is passed different arguments.  To see which arguments are passed
+to a hook, search for the hook's name in the tool's source code, like:
+
+   # --plugin hook
+   if ( $plugin && $plugin->can('init') ) {
+      $plugin->init(
+         slaves         => $slaves,
+         slave_lag_cxns => $slave_lag_cxns,
+         repl_table     => $repl_table,
+      );
+   }
+
+The comment C<# --plugin hook> precedes every hook call.
+
+Please contact Percona if you have questions or need help.
+
 =head1 DSN OPTIONS
 
 These DSN options are used to create a DSN.  Each option is given like

=== modified file 'bin/pt-table-sync'
--- bin/pt-table-sync	2014-05-28 01:15:25 +0000
+++ bin/pt-table-sync	2014-05-30 01:02:37 +0000
@@ -55,7 +55,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.7';
+our $VERSION = '2.2.8';
 
 use strict;
 use warnings FATAL => 'all';

=== modified file 'bin/pt-upgrade'
--- bin/pt-upgrade	2014-05-28 17:03:30 +0000
+++ bin/pt-upgrade	2014-05-30 01:02:37 +0000
@@ -61,7 +61,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.7';
+our $VERSION = '2.2.8';
 
 use strict;
 use warnings FATAL => 'all';

=== modified file 'bin/pt-variable-advisor'
--- bin/pt-variable-advisor	2014-05-24 21:36:33 +0000
+++ bin/pt-variable-advisor	2014-05-30 01:02:37 +0000
@@ -44,7 +44,7 @@
 {
 package Percona::Toolkit;
 
-our $VERSION = '2.2.7';
+our $VERSION = '2.2.8';
 
 use strict;
 use warnings FATAL => 'all';

=== removed directory 'lib/Percona/Agent'
=== removed file 'lib/Percona/Agent/Logger.pm'
--- lib/Percona/Agent/Logger.pm	2013-12-11 03:07:36 +0000
+++ lib/Percona/Agent/Logger.pm	1970-01-01 00:00:00 +0000
@@ -1,341 +0,0 @@
-# This program is copyright 2013 Percona Ireland Ltd.
-# Feedback and improvements are welcome.
-#
-# THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
-# systems, you can issue `man perlgpl' or `man perlartistic' to read these
-# licenses.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA.
-# ###########################################################################
-# Percona::Agent::Logger package
-# ###########################################################################
-package Percona::Agent::Logger;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-use POSIX qw(SIGALRM);
-
-use Lmo;
-use Transformers;
-use Percona::WebAPI::Resource::LogEntry;
-
-Transformers->import(qw(ts));
-
-has 'exit_status' => (
-   is       => 'rw',
-   isa      => 'ScalarRef',
-   required => 1,
-);
-
-has 'pid' => (
-   is       => 'ro',
-   isa      => 'Int',
-   required => 1,
-);
-
-has 'service' => (
-   is       => 'rw',
-   isa      => 'Maybe[Str]',
-   required => 0,
-   default  => sub { return; },
-);
-
-has 'data_ts' => (
-   is       => 'rw',
-   isa      => 'Maybe[Int]',
-   required => 0,
-   default  => sub { return; },
-);
-
-has 'online_logging' => (
-   is       => 'ro',
-   isa      => 'Bool',
-   required => 0,
-   default  => sub { return 1 },
-);
-
-has 'online_logging_enabled' => (
-   is       => 'rw',
-   isa      => 'Bool',
-   required => 0,
-   default  => sub { return 0 },
-);
-
-has 'quiet' => (
-   is       => 'rw',
-   isa      => 'Int',
-   required => 0,
-   default  => sub { return 0 },
-);
-
-has '_buffer' => (
-   is       => 'rw',
-   isa      => 'ArrayRef',
-   required => 0,
-   default  => sub { return []; },
-);
-
-has '_pipe_write' => (
-   is       => 'rw',
-   isa      => 'Maybe[FileHandle]',
-   required => 0,
-);
-
-sub read_stdin {
-   my ( $t ) = @_;
-
-   # Set the SIGALRM handler.
-   POSIX::sigaction(
-      SIGALRM,
-      POSIX::SigAction->new(sub { die 'read timeout'; }),
-   ) or die "Error setting SIGALRM handler: $OS_ERROR";
-
-   my $timeout = 0;
-   my @lines;
-   eval {
-      alarm $t;
-      while(defined(my $line = <STDIN>)) {
-         push @lines, $line;
-      }
-      alarm 0;
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Read error:', $EVAL_ERROR);
-      die $EVAL_ERROR unless $EVAL_ERROR =~ m/read timeout/;
-      $timeout = 1;
-   }
-   return unless scalar @lines || $timeout;
-   return \@lines;
-}
-
-sub start_online_logging {
-   my ($self, %args) = @_;
-   my $client       = $args{client};
-   my $log_link     = $args{log_link};
-   my $read_timeout = $args{read_timeout} || 3;
-
-   return unless $self->online_logging;
-
-   my $pid = open(my $pipe_write, "|-");
-
-   if ($pid) {
-      # parent
-      select $pipe_write;
-      $OUTPUT_AUTOFLUSH = 1;
-      $self->_pipe_write($pipe_write);
-      $self->online_logging_enabled(1);
-   }
-   else {
-      # child
-      my @log_entries;
-      my $n_errors = 0;
-      my $oktorun  = 1;
-      QUEUE:
-      while ($oktorun) {
-         my $lines = read_stdin($read_timeout);
-         last QUEUE unless $lines;
-         LINE:
-         while ( defined(my $line = shift @$lines) ) {
-            # $line = ts,level,n_lines,message
-            my ($ts, $level, $n_lines, $msg) = $line =~ m/^([^,]+),([^,]+),([^,]+),(.+)/s;
-            if ( !$ts || !$level || !$n_lines || !$msg ) {
-               warn "$line\n";
-               next LINE;
-            }
-            if ( $n_lines > 1 ) {
-               $n_lines--;  # first line
-               for ( 1..$n_lines ) {
-                  $msg .= shift @$lines;
-               }
-            }
-
-            push @log_entries, Percona::WebAPI::Resource::LogEntry->new(
-               pid       => $self->pid,
-               entry_ts  => $ts,
-               log_level => $level,
-               message   => $msg,
-               ($self->service ? (service => $self->service) : ()),
-               ($self->data_ts ? (data_ts => $self->data_ts) : ()),
-            );
-         }  # LINE
-
-         if ( scalar @log_entries ) { 
-            eval {
-               $client->post(
-                  link      => $log_link,
-                  resources => \@log_entries,
-               );
-            };
-            if ( my $e = $EVAL_ERROR ) {
-               # Safegaurd: don't spam the agent log file with errors.
-               if ( ++$n_errors <= 10 ) {
-                  warn "Error sending log entry to API: $e";
-                  if ( $n_errors == 10 ) {
-                     my $ts = ts(time, 1);  # 1=UTC
-                     warn "$ts WARNING $n_errors consecutive errors, no more "
-                        . "error messages will be printed until log entries "
-                        . "are sent successfully again.\n";
-                  }
-               }
-            }
-            else {
-               @log_entries = ();
-               $n_errors    = 0;
-            }
-         }  # have log entries
-
-         # Safeguard: don't use too much memory if we lose connection
-         # to the API for a long time.
-         my $n_log_entries = scalar @log_entries;
-         if ( $n_log_entries > 1_000 ) {
-            warn "$n_log_entries log entries in send buffer, "
-               . "removing first 100 to avoid excessive usage.\n";
-            @log_entries = @log_entries[100..($n_log_entries-1)];
-         }
-      }  # QUEUE
-
-      if ( scalar @log_entries ) {
-         my $ts = ts(time, 1);  # 1=UTC
-         warn "$ts WARNING Failed to send these log entries "
-            . "(timestamps are UTC):\n";
-         foreach my $log ( @log_entries ) {
-            warn sprintf("%s %s %s\n",
-               $log->entry_ts,
-               level_name($log->log_level),
-               $log->message,
-            );
-         }
-      }
-
-      exit 0;
-   } # child
-
-   return;
-}
-
-sub level_number {
-   my $name = shift;
-   die "No log level name given" unless $name;
-   my $number = $name eq 'DEBUG'   ? 1
-              : $name eq 'INFO'    ? 2
-              : $name eq 'WARNING' ? 3
-              : $name eq 'ERROR'   ? 4
-              : $name eq 'FATAL'   ? 5
-              : die "Invalid log level name: $name";
-}
-
-sub level_name {
-   my $number = shift;
-   die "No log level name given" unless $number;
-   my $name = $number == 1 ? 'DEBUG'
-            : $number == 2 ? 'INFO'
-            : $number == 3 ? 'WARNING'
-            : $number == 4 ? 'ERROR'
-            : $number == 5 ? 'FATAL'
-            : die "Invalid log level number: $number";
-}
-
-sub debug {
-   my $self = shift;
-   return if $self->online_logging;
-   return $self->_log(0, 'DEBUG', @_);
-}
-
-sub info {
-   my $self = shift;
-   return $self->_log(1, 'INFO', @_);
-}
-
-sub warning {
-   my $self = shift;
-   $self->_set_exit_status();
-   return $self->_log(1, 'WARNING', @_);
-}
-
-sub error {
-   my $self = shift;
-   $self->_set_exit_status();
-   return $self->_log(1, 'ERROR', @_);
-}
-
-sub fatal {
-   my $self = shift;
-   $self->_set_exit_status();
-   $self->_log(1, 'FATAL', @_);
-   exit $self->exit_status;
-}
-
-sub _set_exit_status {
-   my $self = shift;
-   # exit_status is a scalar ref
-   my $exit_status = $self->exit_status;  # get ref
-   $$exit_status |= 1;                    # deref to set
-   $self->exit_status($exit_status);      # save back ref
-   return;
-}
-
-sub _log {
-   my ($self, $online, $level, $msg) = @_;
-
-   my $ts = ts(time, 1);  # 1=UTC
-   my $level_number = level_number($level);
-
-   return if $self->quiet && $level_number < $self->quiet;
-
-   chomp($msg);
-   my $n_lines = 1;
-   $n_lines++ while $msg =~ m/\n/g;
-
-   if ( $online && $self->online_logging_enabled ) {
-      while ( defined(my $log_entry = shift @{$self->_buffer}) ) {
-         $self->_queue_log_entry(@$log_entry);
-      }
-      $self->_queue_log_entry($ts, $level_number, $n_lines, $msg);
-   }
-   else {
-      if ( $online && $self->online_logging ) {
-         push @{$self->_buffer}, [$ts, $level_number, $n_lines, $msg];
-      }
-
-      if ( $level_number >= 3 ) {  # warning
-         print STDERR "$ts $level $msg\n";
-      }
-      else {
-         print STDOUT "$ts $level $msg\n";
-      }
-   }
-
-   return;
-}
-
-sub _queue_log_entry {
-   my ($self, $ts, $log_level, $n_lines, $msg) = @_;
-   print "$ts,$log_level,$n_lines,$msg\n";
-   return;
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-no Lmo;
-1;
-# ###########################################################################
-# End Percona::Agent::Logger package
-# ###########################################################################

=== removed directory 'lib/Percona/Test'
=== removed directory 'lib/Percona/Test/Mock'
=== removed file 'lib/Percona/Test/Mock/AgentLogger.pm'
--- lib/Percona/Test/Mock/AgentLogger.pm	2013-06-17 00:28:18 +0000
+++ lib/Percona/Test/Mock/AgentLogger.pm	1970-01-01 00:00:00 +0000
@@ -1,129 +0,0 @@
-# This program is copyright 2013 Percona Ireland Ltd.
-# Feedback and improvements are welcome.
-#
-# THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
-# systems, you can issue `man perlgpl' or `man perlartistic' to read these
-# licenses.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA.
-# ###########################################################################
-# Percona::Agent::Logger package
-# ###########################################################################
-package Percona::Test::Mock::AgentLogger;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-sub new {
-   my ($class, %args) = @_;
-   my $self = {
-      log            => $args{log},
-
-      exit_status    => $args{exit_status},
-      pid            => $args{pid},
-      online_logging => $args{online_logging},
-
-      service        => undef,
-      data_ts        => undef,
-      quiet          => 0,
-
-   };
-   return bless $self, $class;
-}
-
-sub service {
-   my $self = shift;
-   my $_service = shift;
-   $self->{service} = $_service if $_service;
-   return $self->{service};
-}
-
-sub data_ts {
-   my $self = shift;
-   my $_data_ts = shift;
-   $self->{data_ts} = $_data_ts if $_data_ts;
-   return $self->{data_ts};
-}
-
-sub quiet {
-   my $self = shift;
-   my $_quiet = shift;
-   $self->{quiet} = $_quiet if $_quiet;
-   return $self->{quiet};
-}
-
-sub start_online_logging {
-   my ($self, %args) = @_;
-   $self->_log('-', 'Called start_online_logging()');
-   return;
-}
-
-sub level_number {
-   my $name = shift;
-   die "No log level name given" unless $name;
-   my $number = $name eq 'DEBUG'   ? 1
-              : $name eq 'INFO'    ? 2
-              : $name eq 'WARNING' ? 3
-              : $name eq 'ERROR'   ? 4
-              : $name eq 'FATAL'   ? 5
-              : die "Invalid log level name: $name";
-}
-
-sub level_name {
-   my $number = shift;
-   die "No log level name given" unless $number;
-   my $name = $number == 1 ? 'DEBUG'
-            : $number == 2 ? 'INFO'
-            : $number == 3 ? 'WARNING'
-            : $number == 4 ? 'ERROR'
-            : $number == 5 ? 'FATAL'
-            : die "Invalid log level number: $number";
-}
-
-sub debug {
-   my $self = shift;
-   return $self->_log('DEBUG', @_);
-}
-
-sub info {
-   my $self = shift;
-   return $self->_log('INFO', @_);
-}
-
-sub warning {
-   my $self = shift;
-   return $self->_log('WARNING', @_);
-}
-
-sub error {
-   my $self = shift;
-   return $self->_log('ERROR', @_);
-}
-
-sub fatal {
-   my $self = shift;
-   $self->_log('FATAL', @_);
-   return 255;
-}
-
-sub _log {
-   my ($self, $level, $msg) = @_;
-   push @{$self->{log}}, "$level $msg";
-   return;
-}
-
-1;
-# ###########################################################################
-# End Percona::Test::Mock::AgentLogger package
-# ###########################################################################

=== removed file 'lib/Percona/Test/Mock/UserAgent.pm'
--- lib/Percona/Test/Mock/UserAgent.pm	2013-03-21 19:50:49 +0000
+++ lib/Percona/Test/Mock/UserAgent.pm	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-# This program is copyright 2012-2013 Percona Inc.
-# Feedback and improvements are welcome.
-#
-# THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
-# systems, you can issue `man perlgpl' or `man perlartistic' to read these
-# licenses.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA.
-# ###########################################################################
-# Percona::Test::Mock::UserAgent package
-# ###########################################################################
-{
-package Percona::Test::Mock::UserAgent;
-
-sub new {
-   my ($class, %args) = @_;
-   my $self = {
-      encode       => $args{encode} || sub { return $_[0] },
-      decode       => $args{decode} || sub { return $_[0] },
-      requests     => [],
-      request_objs => [],
-      responses => {
-         get  => [],
-         post => [],
-         put  => [],
-      },
-      content => {
-         post => [],
-         put  => [],
-      },
-   };
-   return bless $self, $class;
-}
-
-sub request {
-   my ($self, $req) = @_;
-   if ( scalar @{$self->{request_objs}} > 10 ) {
-      $self->{request_objs} = [];
-   }
-   push @{$self->{request_objs}}, $req;
-   my $type = lc($req->method);
-   push @{$self->{requests}}, uc($type) . ' ' . $req->uri;
-   if ( $type eq 'post' || $type eq 'put' ) {
-      push @{$self->{content}->{$type}}, $req->content;
-   }
-   my $r = shift @{$self->{responses}->{$type}};
-   my $c = $r->{content} ? $self->{encode}->($r->{content}) : '';
-   my $h = HTTP::Headers->new;
-   $h->header(%{$r->{headers}}) if exists $r->{headers};
-   my $res = HTTP::Response->new(
-      $r->{code} || 200,
-      '',
-      $h,
-      $c,
-   );
-   return $res;
-}
-
-1;
-}
-# ###########################################################################
-# End Percona::Test::Mock::UserAgent package
-# ###########################################################################

=== modified file 'lib/Percona/Toolkit.pm'
--- lib/Percona/Toolkit.pm	2014-02-20 03:47:43 +0000
+++ lib/Percona/Toolkit.pm	2014-05-30 01:02:37 +0000
@@ -18,7 +18,7 @@
 # ###########################################################################
 package Percona::Toolkit;
 
-our $VERSION = '2.2.7';
+our $VERSION = '2.2.8';
 
 use strict;
 use warnings FATAL => 'all';

=== removed directory 'lib/Percona/WebAPI'
=== removed file 'lib/Percona/WebAPI/Client.pm'
--- lib/Percona/WebAPI/Client.pm	2013-09-19 04:05:48 +0000
+++ lib/Percona/WebAPI/Client.pm	1970-01-01 00:00:00 +0000
@@ -1,321 +0,0 @@
-# This program is copyright 2012 codenode LLC, 2012-2013 Percona Ireland Ltd.
-#
-# THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
-# systems, you can issue `man perlgpl' or `man perlartistic' to read these
-# licenses.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA.
-# ###########################################################################
-# Percona::WebAPI::Client package
-# ###########################################################################
-{
-package Percona::WebAPI::Client;
-
-our $VERSION = '0.01';
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-eval {
-   require LWP;
-   require JSON;
-};
-
-use Scalar::Util qw(blessed); 
-
-use Lmo;
-use Percona::Toolkit;
-use Percona::WebAPI::Representation;
-use Percona::WebAPI::Exception::Request;
-use Percona::WebAPI::Exception::Resource;
-
-Percona::WebAPI::Representation->import(qw(as_json));
-Percona::Toolkit->import(qw(_d Dumper have_required_args));
-
-has 'api_key' => (
-   is       => 'ro',
-   isa      => 'Str',
-   required => 1,
-);
-
-has 'entry_link' => (
-   is       => 'rw',
-   isa      => 'Str',
-   required => 0,
-   default  => sub { return 'https://cloud-api.percona.com' },
-);
-
-has 'ua' => (
-   is       => 'rw',
-   isa      => 'Object',
-   lazy     => 1,
-   required => 0,
-   builder  => '_build_ua',
-);
-
-has 'response' => (
-   is       => 'rw',
-   isa      => 'Object',
-   required => 0,
-   default  => undef,
-);
-
-sub _build_ua {
-   my $self = shift;
-   my $ua = LWP::UserAgent->new;
-   $ua->agent("Percona::WebAPI::Client/$Percona::WebAPI::Client::VERSION");
-   $ua->default_header('Content-Type', 'application/json');
-   $ua->default_header('X-Percona-API-Key', $self->api_key);
-   return $ua;
-}
-
-sub get {
-   my ($self, %args) = @_;
-   
-   have_required_args(\%args, qw(
-      link
-   )) or die;
-   my ($link) = $args{link};
-
-   # Get the resources at the link.
-   eval {
-      $self->_request(
-         method => 'GET',
-         link   => $link,
-      );
-   };
-   if ( my $e = $EVAL_ERROR ) {
-      if (blessed($e) && $e->isa('Percona::WebAPI::Exception::Request')) {
-         die $e;
-      }
-      else {
-         die "Unknown error: $e";
-      }
-   }
-
-   # The resource should be represented as JSON, decode it.
-   my $resource = eval {
-      JSON::decode_json($self->response->content);
-   };
-   if ( $EVAL_ERROR ) {
-      warn sprintf "Error decoding resource: %s: %s",
-         $self->response->content,
-         $EVAL_ERROR;
-      return;
-   }
-
-   # If the server tells us the resource's type, create a new object
-   # of that type.  Else, if there's no type, there's no resource, so
-   # we should have received links.  This usually only happens for the
-   # entry link.  The returned resource objects ref may be scalar or
-   # an arrayref; the caller should know.
-   my $resource_objects;
-   if ( my $type = $self->response->headers->{'x-percona-resource-type'} ) {
-      eval {
-         $type = "Percona::WebAPI::Resource::$type";
-         if ( ref $resource eq 'ARRAY' ) {
-            PTDEBUG && _d('Got a list of', $type, 'resources');
-            $resource_objects = [];
-            foreach my $attribs ( @$resource ) {
-               my $obj = $type->new(%$attribs);
-               push @$resource_objects, $obj;
-            }
-         }
-         else {
-            PTDEBUG && _d('Got a', $type, 'resource', Dumper($resource));
-            $resource_objects = $type->new(%$resource);
-         }
-      };
-      if ( my $e = $EVAL_ERROR ) {
-         die Percona::WebAPI::Exception::Resource->new(
-            type  => $type,
-            link  => $link,
-            data  => (ref $resource eq 'ARRAY' ? $resource : [ $resource ]),
-            error => $e,
-         );
-      }
-   }
-   elsif ( exists $resource->{links} ) {
-      # Lie to the caller: this isn't an object, but the caller can
-      # treat it like one, e.g. my $links = $api->get(<entry links>);
-      # then access $links->{self}.  A Links object couldn't have
-      # dynamic attribs anyway, so no use having a real Links obj.
-      $resource_objects = $resource->{links};
-   }
-   elsif ( exists $resource->{pong} ) {
-      PTDEBUG && _d("Ping pong!");
-   }
-   else {
-      warn "Did not get X-Percona-Resource-Type or links from $link\n";
-   }
-
-   return $resource_objects;
-}
-
-# For a successful POST, the server sets the Location header with
-# the URI of the newly created resource.
-sub post {
-   my $self = shift;
-   $self->_set(
-      @_,
-      method => 'POST',
-   );
-   return $self->response->header('Location');
-}
-
-sub put {
-   my $self = shift;
-   $self->_set(
-      @_,
-      method => 'PUT',
-   );
-   return $self->response->header('Location');
-}
-
-sub delete {
-   my ($self, %args) = @_;
-   have_required_args(\%args, qw(
-      link 
-   )) or die;
-   my ($link) = $args{link};
-
-   eval {
-      $self->_request(
-         method  => 'DELETE',
-         link    => $link,
-         headers => { 'Content-Length' => 0 },
-      ); 
-   };
-   if ( my $e = $EVAL_ERROR ) {
-      if (blessed($e) && $e->isa('Percona::WebAPI::Exception::Request')) {
-         die $e;
-      }
-      else {
-         die "Unknown error: $e";
-      }
-   }
-
-   return;
-}
-
-# Low-level POST and PUT handler.
-sub _set {
-   my ($self, %args) = @_;
-   have_required_args(\%args, qw(
-      method
-      resources
-      link
-   )) or die;
-   my $method = $args{method};
-   my $res    = $args{resources};
-   my $link   = $args{link};
-
-   # Optional args
-   my $headers = $args{headers};
-
-   my $content = '';
-   if ( ref($res) eq 'ARRAY' ) {
-      PTDEBUG && _d('List of resources');
-      $content = '[' . join(",\n", map { as_json($_) } @$res) . ']';
-   }
-   elsif ( ref($res) ) {
-      PTDEBUG && _d('Resource object');
-      $content = as_json($res);
-   }
-   elsif ( $res !~ m/\n/ && -f $res ) {
-      PTDEBUG && _d('List of resources in file', $res);
-      $content = '[';
-      my $data = do {
-         local $INPUT_RECORD_SEPARATOR = undef;
-         open my $fh, '<', $res
-            or die "Error opening $res: $OS_ERROR";
-         <$fh>;
-      };
-      $data =~ s/,?\s*$/]/;
-      $content .= $data;
-   }
-   else {
-      PTDEBUG && _d('Resource text');
-      $content = $res;
-   }
-
-   eval {
-      $self->_request(
-         method  => $method,
-         link    => $link,
-         content => $content,
-         headers => $headers,
-      );
-   };
-   if ( my $e = $EVAL_ERROR ) {
-      if (blessed($e) && $e->isa('Percona::WebAPI::Exception::Request')) {
-         die $e;
-      }
-      else {
-         die "Unknown error: $e";
-      }
-   }
-
-   return;
-}
-
-# Low-level HTTP request handler for all methods.  Sets $self->response
-# from the request.  Returns nothing on success (HTTP status 2xx-3xx),
-# else throws an Percona::WebAPI::Exception::Request.
-sub _request {
-   my ($self, %args) = @_;
-
-   have_required_args(\%args, qw(
-      method
-      link 
-   )) or die;
-   my $method = $args{method};
-   my $link   = $args{link};
-   
-   # Optional args
-   my $content = $args{content};
-   my $headers = $args{headers};
-
-   my $req = HTTP::Request->new($method => $link);
-   if ( $content ) {
-      $req->content($content);
-   }
-   if ( $headers ) {
-      map { $req->header($_ => $headers->{$_}) } keys %$headers;
-   }
-   PTDEBUG && _d('Request', $method, $link, Dumper($req));
-
-   my $response = $self->ua->request($req);
-   PTDEBUG && _d('Response', Dumper($response));
-
-   $self->response($response);
-
-   if ( !($response->code >= 200 && $response->code < 400) ) {
-      die Percona::WebAPI::Exception::Request->new(
-         method  => $method,
-         url     => $link,
-         content => $content,
-         status  => $response->code,
-         error   => "Failed to $method $link",
-      );
-   }
-
-   return;
-}
-
-no Lmo;
-1;
-}
-# ###########################################################################
-# End Percona::WebAPI::Client package
-# ###########################################################################

=== removed directory 'lib/Percona/WebAPI/Exception'
=== removed file 'lib/Percona/WebAPI/Exception/Request.pm'
--- lib/Percona/WebAPI/Exception/Request.pm	2012-12-26 20:00:46 +0000
+++ lib/Percona/WebAPI/Exception/Request.pm	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-# This program is copyright 2012-2013 Percona Inc.
-# Feedback and improvements are welcome.
-#
-# THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
-# systems, you can issue `man perlgpl' or `man perlartistic' to read these
-# licenses.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA.
-# ###########################################################################
-# Percona::WebAPI::Exception::Request package
-# ###########################################################################
-{
-package Percona::WebAPI::Exception::Request;
-
-use Lmo;
-use overload '""' => \&as_string;
-
-has 'method' => (
-   is       => 'ro',
-   isa      => 'Str',
-   required => 1,
-);
-
-has 'url' => (
-   is       => 'ro',
-   isa      => 'Str',
-   required => 1,
-);
-
-has 'content' => (
-   is       => 'ro',
-   isa      => 'Maybe[Str]',
-   required => 0,
-);
-
-has 'status' => (
-   is       => 'ro',
-   isa      => 'Int',
-   required => 1,
-);
-
-has 'error' => (
-   is       => 'ro',
-   isa      => 'Str',
-   required => 1,
-);
-
-sub as_string {
-   my $self = shift;
-   chomp(my $error = $self->error);
-   $error =~ s/\n/ /g;
-   return sprintf "%s\nRequest: %s %s %s\nStatus: %d\n",
-      $error, $self->method, $self->url, $self->content || '', $self->status;
-}
-
-no Lmo;
-1;
-}
-# ###########################################################################
-# End Percona::WebAPI::Exception::Request package
-# ###########################################################################

=== removed file 'lib/Percona/WebAPI/Exception/Resource.pm'
--- lib/Percona/WebAPI/Exception/Resource.pm	2013-03-01 16:47:49 +0000
+++ lib/Percona/WebAPI/Exception/Resource.pm	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-# This program is copyright 2012-2013 Percona Inc.
-# Feedback and improvements are welcome.
-#
-# THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
-# systems, you can issue `man perlgpl' or `man perlartistic' to read these
-# licenses.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA.
-# ###########################################################################
-# Percona::WebAPI::Exception::Resource package
-# ###########################################################################
-{
-package Percona::WebAPI::Exception::Resource;
-
-use Lmo;
-use overload '""' => \&as_string;
-use Data::Dumper;
-
-has 'type' => (
-   is       => 'ro',
-   isa      => 'Str',
-   required => 1,
-);
-
-has 'link' => (
-   is       => 'ro',
-   isa      => 'Str',
-   required => 1,
-);
-
-has 'data' => (
-   is       => 'ro',
-   isa      => 'ArrayRef',
-   required => 1,
-);
-
-has 'error' => (
-   is       => 'ro',
-   isa      => 'Str',
-   required => 1,
-);
-
-sub as_string {
-   my $self = shift;
-   chomp(my $error = $self->error);
-   local $Data::Dumper::Indent    = 1;
-   local $Data::Dumper::Sortkeys  = 1;
-   local $Data::Dumper::Quotekeys = 0;
-   return sprintf "Invalid %s resource from %s:\n\n%s\nError: %s\n\n",
-      $self->type, $self->link, Dumper($self->data), $error;
-}
-
-no Lmo;
-1;
-}
-# ###########################################################################
-# End Percona::WebAPI::Exception::Resource package
-# ###########################################################################

=== removed file 'lib/Percona/WebAPI/Representation.pm'
--- lib/Percona/WebAPI/Representation.pm	2013-06-15 19:31:38 +0000
+++ lib/Percona/WebAPI/Representation.pm	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-# This program is copyright 2012-2013 Percona Inc.
-# Feedback and improvements are welcome.
-#
-# THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
-# systems, you can issue `man perlgpl' or `man perlartistic' to read these
-# licenses.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA.
-# ###########################################################################
-# Percona::WebAPI::Representation package
-# ###########################################################################
-{
-package Percona::WebAPI::Representation;
-
-eval {
-   require JSON;
-};
-
-require Exporter;
-our @ISA       = qw(Exporter);
-our @EXPORT_OK = qw(
-   as_hashref
-   as_json
-   as_config
-);
-
-sub as_hashref {
-   my ($resource, %args) = @_;
-
-   # Copy the object into a new hashref.
-   my $as_hashref = { %$resource };
-
-   # Delete the links because they're just for client-side use
-   # and the caller should be sending this object, not getting it.
-   # But sometimes for testing we want to keep the links.
-   if ( !defined $args{with_links} || !$args{with_links} ) {
-      delete $as_hashref->{links};
-   }
-
-   return $as_hashref;
-}
-
-sub as_json {
-   my ($resource, %args) = @_;
-
-   my $json = $args{json} || JSON->new;
-   $json->allow_blessed([]);
-   $json->convert_blessed([]);
-
-   my $text = $json->encode(
-      ref $resource eq 'ARRAY' ? $resource : as_hashref($resource, %args)
-   );
-   if ( $args{json} && $text ) {  # for testing
-      chomp($text);
-      $text .= "\n";
-   }
-   return $text;
-}
-
-sub as_config {
-   my $resource = shift;
-   if ( !$resource->isa('Percona::WebAPI::Resource::Config') ) {
-      die "Only Config resources can be represented as config.\n";
-   }
-   my $as_hashref = as_hashref($resource);
-   my $options    = $as_hashref->{options};
-   my $config     = join("\n",
-      map { defined $options->{$_} ?  "$_=$options->{$_}" : "$_" }
-      sort keys %$options
-   ) . "\n";
-   return $config;
-}
-
-1;
-}
-# ###########################################################################
-# End Percona::WebAPI::Representation package
-# ###########################################################################

=== removed directory 'lib/Percona/WebAPI/Resource'
=== removed file 'lib/Percona/WebAPI/Resource/Agent.pm'
--- lib/Percona/WebAPI/Resource/Agent.pm	2013-06-15 02:59:14 +0000
+++ lib/Percona/WebAPI/Resource/Agent.pm	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-# This program is copyright 2012-2013 Percona Inc.
-# Feedback and improvements are welcome.
-#
-# THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
-# systems, you can issue `man perlgpl' or `man perlartistic' to read these
-# licenses.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA.
-# ###########################################################################
-# Percona::WebAPI::Resource::Agent package
-# ###########################################################################
-{
-package Percona::WebAPI::Resource::Agent;
-
-use Lmo;
-
-has 'uuid' => (
-   is       => 'ro',
-   isa      => 'Str',
-   required => 0,
-);
-
-has 'username' => (
-   is       => 'rw',
-   isa      => 'Str',
-   required => 0,
-   default  => sub { return $ENV{USER} || $ENV{LOGNAME} },
-);
-
-has 'hostname' => (
-   is       => 'rw',
-   isa      => 'Str',
-   required => 0,
-   default  => sub {
-      chomp(my $hostname = `hostname`);
-      return $hostname;
-   },
-);
-
-has 'alias' => (
-   is       => 'rw',
-   isa      => 'Str',
-   required => 0,
-);
-
-has 'versions' => (
-   is       => 'rw',
-   isa      => 'Maybe[HashRef]',
-   required => 0,
-);
-
-has 'links' => (
-   is       => 'rw',
-   isa      => 'Maybe[HashRef]',
-   required => 0,
-   default  => sub { return {} },
-);
-
-sub name {
-   my ($self) = @_;
-   return $self->alias || $self->hostname || $self->uuid || 'Unknown';
-}
-
-no Lmo;
-1;
-}
-# ###########################################################################
-# End Percona::WebAPI::Resource::Agent package
-# ###########################################################################

=== removed file 'lib/Percona/WebAPI/Resource/Config.pm'
--- lib/Percona/WebAPI/Resource/Config.pm	2013-03-01 16:47:49 +0000
+++ lib/Percona/WebAPI/Resource/Config.pm	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-# This program is copyright 2012-2013 Percona Inc.
-# Feedback and improvements are welcome.
-#
-# THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
-# systems, you can issue `man perlgpl' or `man perlartistic' to read these
-# licenses.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA.
-# ###########################################################################
-# Percona::WebAPI::Resource::Config package
-# ###########################################################################
-{
-package Percona::WebAPI::Resource::Config;
-
-use Lmo;
-
-has 'ts' => (
-   is       => 'ro',
-   isa      => 'Int',
-   required => 1,
-);
-
-has 'name' => (
-   is       => 'ro',
-   isa      => 'Str',
-   required => 1,
-);
-
-has 'options' => (
-   is       => 'ro',
-   isa      => 'HashRef',
-   required => 1,
-);
-
-has 'links' => (
-   is       => 'rw',
-   isa      => 'Maybe[HashRef]',
-   required => 0,
-   default  => sub { return {} },
-);
-
-no Lmo;
-1;
-}
-# ###########################################################################
-# End Percona::WebAPI::Resource::Config package
-# ###########################################################################

=== removed file 'lib/Percona/WebAPI/Resource/LogEntry.pm'
--- lib/Percona/WebAPI/Resource/LogEntry.pm	2013-06-10 00:15:16 +0000
+++ lib/Percona/WebAPI/Resource/LogEntry.pm	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-# This program is copyright 2013 Percona Inc.
-# Feedback and improvements are welcome.
-#
-# THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
-# systems, you can issue `man perlgpl' or `man perlartistic' to read these
-# licenses.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA.
-# ###########################################################################
-# Percona::WebAPI::Resource::LogEntry package
-# ###########################################################################
-{
-package Percona::WebAPI::Resource::LogEntry;
-
-use Lmo;
-
-has 'pid' => (
-   is       => 'ro',
-   isa      => 'Int',
-   required => 1,
-);
-
-has 'service' => (
-   is       => 'ro',
-   isa      => 'Str',
-   required => 0,
-);
-
-has 'data_ts' => (
-   is       => 'ro',
-   isa      => 'Int',
-   required => 0,
-);
-
-has 'entry_ts' => (
-   is       => 'ro',
-   isa      => 'Str',
-   required => 1,
-);
-
-has 'log_level' => (
-   is       => 'ro',
-   isa      => 'Int',
-   required => 1,
-);
-
-has 'message' => (
-   is       => 'ro',
-   isa      => 'Str',
-   required => 1,
-);
-
-no Lmo;
-1;
-}
-# ###########################################################################
-# End Percona::WebAPI::Resource::LogEntry package
-# ###########################################################################

=== removed file 'lib/Percona/WebAPI/Resource/Service.pm'
--- lib/Percona/WebAPI/Resource/Service.pm	2013-04-19 20:49:01 +0000
+++ lib/Percona/WebAPI/Resource/Service.pm	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-# This program is copyright 2012-2013 Percona Inc.
-# Feedback and improvements are welcome.
-#
-# THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
-# systems, you can issue `man perlgpl' or `man perlartistic' to read these
-# licenses.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA.
-# ###########################################################################
-# Percona::WebAPI::Resource::Service package
-# ###########################################################################
-{
-package Percona::WebAPI::Resource::Service;
-
-use Lmo;
-
-has 'ts' => (
-   is       => 'ro',
-   isa      => 'Int',
-   required => 1,
-);
-
-has 'name' => (
-   is       => 'ro',
-   isa      => 'Str',
-   required => 1,
-);
-
-has 'tasks' => (
-   is       => 'ro',
-   isa      => 'ArrayRef[Percona::WebAPI::Resource::Task]',
-   required => 1,
-);
-
-has 'run_schedule' => (
-   is       => 'ro',
-   isa      => 'Str',
-   required => 0,
-);
-
-has 'spool_schedule' => (
-   is       => 'ro',
-   isa      => 'Str',
-   required => 0,
-);
-
-has 'meta' => (
-   is       => 'ro',
-   isa      => 'Bool',
-   required => 0,
-   default  => sub { return 0 },
-);
-
-has 'run_once' => (
-   is       => 'ro',
-   isa      => 'Bool',
-   required => 0,
-   default  => sub { return 0 },
-);
-
-has 'links' => (
-   is       => 'rw',
-   isa      => 'Maybe[HashRef]',
-   required => 0,
-   default  => sub { return {} },
-);
-
-sub BUILDARGS {
-   my ($class, %args) = @_;
-   if ( ref $args{tasks} eq 'ARRAY' ) {
-      my @tasks;
-      foreach my $run_hashref ( @{$args{tasks}} ) {
-         my $task = Percona::WebAPI::Resource::Task->new(%$run_hashref);
-         push @tasks, $task;
-      }
-      $args{tasks} = \@tasks;
-   }
-   return $class->SUPER::BUILDARGS(%args);
-}
-
-no Lmo;
-1;
-}
-# ###########################################################################
-# End Percona::WebAPI::Resource::Service package
-# ###########################################################################

=== removed file 'lib/Percona/WebAPI/Resource/Task.pm'
--- lib/Percona/WebAPI/Resource/Task.pm	2013-04-19 20:49:01 +0000
+++ lib/Percona/WebAPI/Resource/Task.pm	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-# This program is copyright 2012-2013 Percona Inc.
-# Feedback and improvements are welcome.
-#
-# THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
-# systems, you can issue `man perlgpl' or `man perlartistic' to read these
-# licenses.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA.
-# ###########################################################################
-# Percona::WebAPI::Resource::Task package
-# ###########################################################################
-{
-package Percona::WebAPI::Resource::Task;
-
-use Lmo;
-
-has 'name' => (
-   is       => 'ro',
-   isa      => 'Str',
-   required => 1,
-);
-
-has 'number' => (
-   is       => 'ro',
-   isa      => 'Int',
-   required => 1,
-);
-
-has 'program' => (
-   is       => 'ro',
-   isa      => 'Maybe[Str]',
-   required => 0,
-);
-
-has 'query' => (
-   is       => 'ro',
-   isa      => 'Maybe[Str]',
-   required => 0,
-);
-
-has 'output' => (
-   is       => 'ro',
-   isa      => 'Maybe[Str]',
-   required => 0,
-);
-
-sub TO_JSON { return { %{ shift() } }; }
-
-no Lmo;
-1;
-}
-# ###########################################################################
-# End Percona::WebAPI::Resource::Task package
-# ###########################################################################

=== removed directory 't/lib/Percona/WebAPI'
=== removed file 't/lib/Percona/WebAPI/Client.t'
--- t/lib/Percona/WebAPI/Client.t	2013-08-08 19:34:29 +0000
+++ t/lib/Percona/WebAPI/Client.t	1970-01-01 00:00:00 +0000
@@ -1,236 +0,0 @@
-#!/usr/bin/env perl
-
-BEGIN {
-   die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
-      unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
-   unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
-};
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use Test::More;
-use JSON;
-use File::Temp qw(tempdir);
-
-use Percona::Test;
-use Percona::Test::Mock::UserAgent;
-use Percona::WebAPI::Client;
-use Percona::WebAPI::Resource::Agent;
-use Percona::WebAPI::Resource::Config;
-use Percona::WebAPI::Resource::Service;
-use Percona::WebAPI::Resource::Task;
-
-Percona::Toolkit->import(qw(Dumper have_required_args));
-Percona::WebAPI::Representation->import(qw(as_json as_hashref));
-
-# #############################################################################
-# Create a client with a mock user-agent.
-# #############################################################################
-
-my $json = JSON->new;
-$json->allow_blessed([]);
-$json->convert_blessed([]);
-
-my $ua = Percona::Test::Mock::UserAgent->new(
-   encode => sub { my $c = shift; return $json->encode($c || {}) },
-);
-
-my $client = eval {
-   Percona::WebAPI::Client->new(
-      api_key => '123',
-      ua      => $ua,
-   );
-};
-
-is(
-   $EVAL_ERROR,
-   '',
-   'Create client'
-) or die;
-
-# #############################################################################
-# First thing a client should do is get the entry links.
-# #############################################################################
-
-my $return_links = {  # what the server returns
-   agents => '/agents',
-};
-
-$ua->{responses}->{get} = [
-   {
-      content => {
-         links => $return_links,
-      }
-   },
-];
-
-my $links = $client->get(link => $client->entry_link);
-
-is_deeply(
-   $links,
-   $return_links,
-   "Get entry links"
-) or diag(Dumper($links));
-
-is_deeply(
-   $ua->{requests},
-   [
-      'GET https://cloud-api.percona.com',
-   ],
-   "1 request, 1 GET"
-) or diag(Dumper($ua->{requests}));
-
-
-# #############################################################################
-# Second, a new client will POST an Agent for itself.  The entry links
-# should have an "agents" link.  The server response is empty but the
-# URI for the new Agent resource is given by the Location header.
-# #############################################################################
-
-my $agent = Percona::WebAPI::Resource::Agent->new(
-   id       => '123',
-   hostname => 'host',
-);
-
-$ua->{responses}->{post} = [
-   {
-      headers => { 'Location' => 'agents/5' },
-      content => '',
-   },
-];
-
-my $uri = $client->post(resources => $agent, link => $links->{agents});
-
-is(
-   $uri,
-   "agents/5",
-   "POST Agent, got Location URI"
-);
-
-# #############################################################################
-# After successfully creating the new Agent, the client should fetch
-# the new Agent resoruce which will have links to the next step: the
-# agent's config.
-# #############################################################################
-
-$return_links = {
-   self   => 'agents/5',
-   config => 'agents/5/config',
-};
-
-my $content = {
-   %{ as_hashref($agent) },
-   links => $return_links,
-};
-
-$ua->{responses}->{get} = [
-   {
-      headers => { 'X-Percona-Resource-Type' => 'Agent' },
-      content => $content,
-   },
-];
-
-# Re-using $agent, i.e. updating it with the actual, newly created
-# Agent resource as returned by the server with links.
-$agent = $client->get(link => $uri);
-
-# Need to use with_links=>1 here because by as_hashref() removes
-# links by default because it's usually used to encode and send
-# resources, and clients never send links; but here we're using
-# it for testing.
-is_deeply(
-   as_hashref($agent, with_links => 1),
-   $content,
-   "GET Agent with links"
-) or diag(Dumper(as_hashref($agent, with_links => 1)));
-
-# #############################################################################
-# Now the agent can get its Config.
-# #############################################################################
-
-$return_links = {
-   self     => 'agents/5/config',
-   services => 'agents/5/services',
-};
-
-my $return_config = Percona::WebAPI::Resource::Config->new(
-   ts      => '100',
-   name    => 'Default',
-   options => {},
-   links   => $return_links,
-);
-
-$ua->{responses}->{get} = [
-   {
-      headers => { 'X-Percona-Resource-Type' => 'Config' },
-      content => as_hashref($return_config, with_links => 1),
-   },
-];
-
-my $config = $client->get(link => $agent->links->{config});
-
-is_deeply(
-   as_hashref($config, with_links => 1),
-   as_hashref($return_config, with_links => 1), 
-   "GET Config"
-) or diag(Dumper(as_hashref($config, with_links => 1)));
-
-# #############################################################################
-# Once an agent is configured, i.e. successfully gets a Config resource,
-# its Config should have a services link which returns a list of Service
-# resources, each with their own links.
-# #############################################################################
-
-$return_links = {
-   'send_data' => '/query-monitor',
-};
-
-my $run0 = Percona::WebAPI::Resource::Task->new(
-   name    => 'run-pqd',
-   number  => '0',
-   program => 'pt-query-digest',
-   options => '--output json',
-   output  => 'spool',
-);
-
-my $svc0 = Percona::WebAPI::Resource::Service->new(
-   ts             => '123',
-   name           => 'query-monitor',
-   run_schedule   => '1 * * * *',
-   spool_schedule => '2 * * * *',
-   tasks          => [ $run0 ],
-   links          => $return_links,
-);
-
-$ua->{responses}->{get} = [
-   {
-      headers => { 'X-Percona-Resource-Type' => 'Service' },
-      content => [ as_hashref($svc0, with_links => 1) ],
-   },
-];
-
-my $services = $client->get(link => $config->links->{services});
-
-is(
-   scalar @$services,
-   1,
-   "Got 1 service"
-);
-
-is_deeply(
-   as_hashref($services->[0], with_links => 1),
-   as_hashref($svc0, with_links => 1),
-   "GET Services"
-) or diag(Dumper(as_hashref($services, with_links => 1)));
-
-is(
-   $services->[0]->links->{send_data},
-   "/query-monitor",
-   "send_data link for Service"
-);
-
-# #############################################################################
-# Done.
-# #############################################################################
-done_testing;

=== removed file 't/lib/Percona/WebAPI/Representation.t'
--- t/lib/Percona/WebAPI/Representation.t	2013-03-01 16:47:49 +0000
+++ t/lib/Percona/WebAPI/Representation.t	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-#!/usr/bin/perl
-
-BEGIN {
-   die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
-      unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
-   unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
-};
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use Test::More;
-
-use PerconaTest;
-use Percona::Toolkit;
-use Percona::WebAPI::Resource::Agent;
-use Percona::WebAPI::Resource::Config;
-use Percona::WebAPI::Representation;
-
-my $agent = Percona::WebAPI::Resource::Agent->new(
-   id       => '123',
-   hostname => 'pt',
-   versions => {
-      Perl => '5.10.1',
-   },
-);
-
-is(
-   Percona::WebAPI::Representation::as_json($agent),
-   q/{"versions":{"Perl":"5.10.1"},"id":"123","hostname":"pt"}/,
-   "as_json"
-);
-
-my $config = Percona::WebAPI::Resource::Config->new(
-   ts      => '100',
-   name    => 'Default',
-   options => {
-      'check-interval' => 60,
-   },
-);
-
-is(
-   Percona::WebAPI::Representation::as_config($config),
-   "check-interval=60\n",
-   "as_config"
-);
-
-# #############################################################################
-# Done.
-# #############################################################################
-done_testing;

=== removed directory 't/pt-agent'
=== removed file 't/pt-agent/basics.t'
--- t/pt-agent/basics.t	2013-04-13 17:27:45 +0000
+++ t/pt-agent/basics.t	1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-#!/usr/bin/env perl
-
-BEGIN {
-   die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
-      unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
-   unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
-};
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use Test::More;
-
-use File::Temp qw(tempdir);
-
-use Percona::Test;
-use Sandbox;
-use Percona::Test::Mock::UserAgent;
-require "$trunk/bin/pt-agent";
-
-my $dp  = new DSNParser(opts=>$dsn_opts);
-my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
-my $dsn = $sb->dsn_for('master');
-my $o   = new OptionParser();
-$o->get_specs("$trunk/bin/pt-agent");
-$o->get_opts();
-my $cxn = Cxn->new(
-   dsn_string   => $dsn,
-   OptionParser => $o,
-   DSNParser    => $dp,
-);
-
-Percona::Toolkit->import(qw(Dumper));
-Percona::WebAPI::Representation->import(qw(as_hashref));
-
-# Running the agent is going to cause it to schedule the services,
-# i.e. write a real crontab.  The test box/user shouldn't have a
-# crontab, so we'll warn and clobber it if there is one.
-my $crontab = `crontab -l 2>/dev/null`;
-if ( $crontab ) {
-   warn "Removing crontab: $crontab\n";
-   `crontab -r`;
-}
-
-my $tmp_lib = "/tmp/pt-agent";
-my $tmp_log = "/tmp/pt-agent.log";
-my $tmp_pid = "/tmp/pt-agent.pid";
-
-diag(`rm -rf $tmp_lib`) if -d $tmp_lib;
-unlink $tmp_log if -f $tmp_log;
-unlink $tmp_pid if -f $tmp_pid;
-
-my $config_file = pt_agent::get_config_file();
-unlink $config_file if -f $config_file;
-
-my $output;
-
-{
-   no strict;
-   no warnings;
-   local *pt_agent::start_agent = sub {
-      print "start_agent\n";
-      return {
-         agent  => 0,
-         client => 0,
-         daemon => 0,
-      };
-   };
-   local *pt_agent::run_agent   = sub {
-      print "run_agent\n";
-   };
-
-   $output = output(
-      sub {  
-         pt_agent::main(
-            qw(--api-key 123)
-         );
-      },
-      stderr => 1,
-   );
-}
-
-like(
-   $output,
-   qr/start_agent\nrun_agent\n/,
-   "Starts and runs without a config file"
-);
-
-# #############################################################################
-# Done.
-# #############################################################################
-
-`crontab -r 2>/dev/null`;
-
-if ( -f $config_file ) {
-   unlink $config_file 
-      or warn "Error removing $config_file: $OS_ERROR";
-}
-
-done_testing;

=== removed file 't/pt-agent/get_services.t'
--- t/pt-agent/get_services.t	2013-06-17 04:01:30 +0000
+++ t/pt-agent/get_services.t	1970-01-01 00:00:00 +0000
@@ -1,423 +0,0 @@
-#!/usr/bin/env perl
-
-BEGIN {
-   die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
-      unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
-   unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
-};
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use Test::More;
-
-use JSON;
-use File::Temp qw(tempdir);
-
-use Percona::Test;
-use Percona::Test::Mock::UserAgent;
-use Percona::Test::Mock::AgentLogger;
-require "$trunk/bin/pt-agent";
-
-Percona::Toolkit->import(qw(Dumper));
-Percona::WebAPI::Representation->import(qw(as_hashref));
-
-my @log;
-my $logger = Percona::Test::Mock::AgentLogger->new(log => \@log);
-pt_agent::_logger($logger);
-
-# Fake --lib and --spool dirs.
-my $tmpdir = tempdir("/tmp/pt-agent.$PID.XXXXXX", CLEANUP => 1);
-output( sub {
-   pt_agent::init_lib_dir(lib_dir => $tmpdir);
-});
-
-# #############################################################################
-# Create mock client and Agent
-# #############################################################################
-
-# These aren't the real tests yet: to run_agent, first we need
-# a client and Agent, so create mock ones.
-
-my $output;
-my $json = JSON->new->canonical([1])->pretty;
-$json->allow_blessed([]);
-$json->convert_blessed([]);
-
-my $ua = Percona::Test::Mock::UserAgent->new(
-   encode => sub { my $c = shift; return $json->encode($c || {}) },
-);
-
-my $client = eval {
-   Percona::WebAPI::Client->new(
-      api_key => '123',
-      ua      => $ua,
-   );
-};
-
-is(
-   $EVAL_ERROR,
-   '',
-   'Create mock client'
-) or die;
-
-my $agent = Percona::WebAPI::Resource::Agent->new(
-   uuid     => '123',
-   hostname => 'host',
-   username => 'user',
-   links    => {
-      self   => '/agents/123',
-      config => '/agents/123/config',
-   },
-);
-
-my @cmds;
-my $exec_cmd = sub {
-   my $cmd = shift;
-   push @cmds, $cmd;
-   return 0;
-};
-
-# #############################################################################
-# Test get_services()
-# #############################################################################
-
-# query-history
-
-my $run0 = Percona::WebAPI::Resource::Task->new(
-   name    => 'query-history',
-   number  => '0',
-   program => 'pt-query-digest --output json',
-   output  => 'spool',
-);
-
-my $qh = Percona::WebAPI::Resource::Service->new(
-   ts             => '100',
-   name           => 'query-history',
-   run_schedule   => '1 * * * *',
-   spool_schedule => '2 * * * *',
-   tasks          => [ $run0 ],
-   links          => {
-      self => '/query-history',
-      data => '/query-history/data',
-   },
-);
-
-my $run1  = Percona::WebAPI::Resource::Task->new(
-   name    => 'start-query-history',
-   number  => '0',
-   program => 'echo "start-qh"',
-   output  => 'spool',
-);
-
-my $start_qh = Percona::WebAPI::Resource::Service->new(
-   ts             => '100',
-   name           => 'start-query-history',
-   meta           => 1,
-   tasks          => [ $run1 ],
-   links          => {
-      self => '/query-history',
-      data => '/query-history/data',
-   },
-);
-
-$ua->{responses}->{get} = [
-   {
-      headers => { 'X-Percona-Resource-Type' => 'Service' },
-      content => [
-         as_hashref($qh, with_links => 1),
-         as_hashref($start_qh, with_links => 1),
-      ],
-   },
-];
-
-my $services = {};
-my $success  = 0;
-
-$output = output(
-   sub {
-      ($services, $success) = pt_agent::get_services(
-         # Required args
-         link        => '/agents/123/services',
-         agent       => $agent,
-         client      => $client,
-         lib_dir     => $tmpdir,
-         services    => $services,
-         # Optional args, for testing
-         json        => $json,
-         bin_dir     => "$trunk/bin/",
-         exec_cmd    => $exec_cmd,
-      );
-   },
-   stderr => 1,
-);
-
-is(
-   $success,
-   1,
-   "Success"
-);
-
-is(
-   ref $services,
-   'HASH',
-   "Return services as hashref"
-) or diag(Dumper($services));
-
-is(
-   scalar keys %$services,
-   2,
-   'Only 2 services'
-) or diag(Dumper($services));
-
-ok(
-   exists $services->{'query-history'},
-   "services hashref keyed on service name"
-) or diag(Dumper($services));
-
-isa_ok(
-   ref $services->{'query-history'},
-   'Percona::WebAPI::Resource::Service',
-   'services->{query-history}'
-);
-
-my $crontab = -f "$tmpdir/crontab" ? slurp_file("$tmpdir/crontab") : '';
-is(
-   $crontab,
-   "1 * * * * $trunk/bin/pt-agent --run-service query-history
-2 * * * * $trunk/bin/pt-agent --send-data query-history
-",
-   "crontab file"
-) or diag($output, `ls -l $tmpdir/*`, Dumper(\@log));
-
-is_deeply(
-   \@cmds,
-   [
-      "$trunk/bin/pt-agent --run-service start-query-history >> $tmpdir/logs/start-stop.log 2>&1",
-      "crontab $tmpdir/crontab > $tmpdir/crontab.err 2>&1",
-   ],
-   "Ran start-service and crontab"
-) or diag(Dumper(\@cmds), Dumper(\@log));
-
-ok(
-   -f "$tmpdir/services/query-history",
-   "Wrote --lib/services/query-history"
-);
-
-# #############################################################################
-# A more realistic transaction
-# #############################################################################
-
-# services/query-history should exist from the previous tests.  For these
-# tests, get_services() should update the file, so we empty it and check
-# that it's re-created, i.e. updated.
-diag(`echo -n > $tmpdir/services/query-history`);
-is(
-   -s "$tmpdir/services/query-history",
-   0,
-   "Start: empty --lib/services/query-history"
-);
-
-# start-query-history
-
-my $task1 = Percona::WebAPI::Resource::Task->new(
-   name    => 'disable-slow-query-log',
-   number  => '0',
-   query   => "SET GLOBAL slow_query_log=0",
-);
-
-my $task2 = Percona::WebAPI::Resource::Task->new(
-   name    => 'set-slow-query-log-file',
-   number  => '1',
-   query   => "SET GLOBAL slow_query_log_file='/tmp/slow.log'",
-);
-
-my $task3 = Percona::WebAPI::Resource::Task->new(
-   name    => 'set-long-query-time',
-   number  => '2',
-   query   => "SET GLOBAL long_query_time=0.01",
-);
-
-my $task4 = Percona::WebAPI::Resource::Task->new(
-   name    => 'enable-slow-query-log',
-   number  => '3',
-   query   => "SET GLOBAL slow_query_log=1",
-);
-
-$start_qh = Percona::WebAPI::Resource::Service->new(
-   ts             => '100',
-   name           => 'start-query-history',
-   tasks          => [ $task1, $task2, $task3, $task4 ],
-   meta           => 1,
-   links          => {
-      self => '/query-history',
-      data => '/query-history/data',
-   },
-);
-
-# stop-query-history
-
-my $task5 = Percona::WebAPI::Resource::Task->new(
-   name    => 'disable-slow-query-log',
-   number  => '0',
-   query   => "SET GLOBAL slow_query_log=0",
-);
-
-my $stop_qh = Percona::WebAPI::Resource::Service->new(
-   ts             => '100',
-   name           => 'stop-query-history',
-   tasks          => [ $task5 ],
-   meta           => 1,
-   links          => {
-      self => '/query-history',
-      data => '/query-history/data',
-   },
-);
-
-# We'll use query-history from the previous tests.
-
-$ua->{responses}->{get} = [
-   {
-      headers => { 'X-Percona-Resource-Type' => 'Service' },
-      content => [
-         as_hashref($start_qh, with_links => 1),
-         as_hashref($stop_qh,  with_links => 1),
-         as_hashref($qh,       with_links => 1),  # from previous tests
-      ],
-   },
-];
-
-@log      = ();
-@cmds     = ();
-$services = {};
-$success  = 0;
-
-$output = output(
-   sub {
-      ($services, $success) = pt_agent::get_services(
-         # Required args
-         link        => '/agents/123/services',
-         agent       => $agent,
-         client      => $client,
-         lib_dir     => $tmpdir,
-         services    => $services,
-         # Optional args, for testing
-         json        => $json,
-         bin_dir     => "$trunk/bin/",
-         exec_cmd    => $exec_cmd,
-      );
-   },
-   stderr => 1,
-);
-
-is_deeply(
-   \@cmds,
-   [
-      "$trunk/bin/pt-agent --run-service start-query-history >> $tmpdir/logs/start-stop.log 2>&1",
-      "crontab $tmpdir/crontab > $tmpdir/crontab.err 2>&1",
-   ],
-   "Start: ran start-query-history"
-) or diag(Dumper(\@cmds), $output);
-
-ok(
-   -f "$tmpdir/services/start-query-history",
-   "Start: added --lib/services/start-query-history"
-) or diag($output);
-
-ok(
-   -f "$tmpdir/services/stop-query-history",
-   "Start: added --lib/services/stop-query-history"
-) or diag($output);
-
-my $contents = slurp_file("$tmpdir/services/query-history");
-like(
-   $contents,
-   qr/query-history/,
-   "Start: updated --lib/services/query-history"
-) or diag($output);
-
-$crontab = slurp_file("$tmpdir/crontab");
-is(
-   $crontab,
-   "1 * * * * $trunk/bin/pt-agent --run-service query-history
-2 * * * * $trunk/bin/pt-agent --send-data query-history
-",
-   "Start: only scheduled query-history"
-) or diag($output);
-
-# #############################################################################
-# Update and restart a service
-# #############################################################################
-
-# pt-agent should remove a service's --lib/meta/ files when restarting,
-# so create one and check that it's removed.
-diag(`touch $tmpdir/meta/query-history.foo`);
-ok(
-   -f "$tmpdir/meta/query-history.foo",
-   "Restart: meta file exists"
-);
-
-$qh = Percona::WebAPI::Resource::Service->new(
-   ts             => '200',  # was 100
-   name           => 'query-history',
-   run_schedule   => '1 * * * *',
-   spool_schedule => '2 * * * *',
-   tasks          => [ $run0 ],
-   links          => {
-      self => '/query-history',
-      data => '/query-history/data',
-   },
-);
-
-$ua->{responses}->{get} = [
-   {
-      headers => { 'X-Percona-Resource-Type' => 'Service' },
-      content => [
-         as_hashref($start_qh, with_links => 1),  # has not changed
-         as_hashref($stop_qh,  with_links => 1),  # has not changed
-         as_hashref($qh,       with_links => 1),
-      ],
-   },
-];
-
-@log      = ();
-@cmds     = ();
-$success  = 0;
-
-$output = output(
-   sub {
-      ($services, $success) = pt_agent::get_services(
-         # Required args
-         link        => '/agents/123/services',
-         agent       => $agent,
-         client      => $client,
-         lib_dir     => $tmpdir,
-         services    => $services,  # retval from previous call
-         # Optional args, for testing
-         json        => $json,
-         bin_dir     => "$trunk/bin/",
-         exec_cmd    => $exec_cmd,
-      );
-   },
-   stderr => 1,
-);
-
-is_deeply(
-   \@cmds,
-   [
-      "$trunk/bin/pt-agent --run-service stop-query-history >> $tmpdir/logs/start-stop.log 2>&1",
-      "$trunk/bin/pt-agent --run-service start-query-history >> $tmpdir/logs/start-stop.log 2>&1",
-      "crontab $tmpdir/crontab > $tmpdir/crontab.err 2>&1",
-   ],
-   "Restart: ran stop-query-history then start-query-history"
-) or diag(Dumper(\@cmds), $output);
-
-ok(
-   !-f "$tmpdir/meta/query-history.foo",
-   "Restart: meta file removed"
-) or diag($output);
-
-# #############################################################################
-# Done.
-# #############################################################################
-done_testing;

=== removed file 't/pt-agent/init_agent.t'
--- t/pt-agent/init_agent.t	2013-09-23 19:07:34 +0000
+++ t/pt-agent/init_agent.t	1970-01-01 00:00:00 +0000
@@ -1,333 +0,0 @@
-#!/usr/bin/env perl
-
-BEGIN {
-   die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
-      unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
-   unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
-};
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use Test::More;
-use JSON;
-use File::Temp qw(tempdir);
-
-use Percona::Test;
-use Percona::Test::Mock::UserAgent;
-use Percona::Test::Mock::AgentLogger;
-require "$trunk/bin/pt-agent";
-
-Percona::Toolkit->import(qw(Dumper));
-Percona::WebAPI::Representation->import(qw(as_hashref));
-
-my $tmpdir = tempdir("/tmp/pt-agent.$PID.XXXXXX", CLEANUP => 1);
-
-my $json = JSON->new->canonical([1])->pretty;
-$json->allow_blessed([]);
-$json->convert_blessed([]);
-
-my @log;
-my $logger = Percona::Test::Mock::AgentLogger->new(log => \@log);
-pt_agent::_logger($logger);
-
-my $ua = Percona::Test::Mock::UserAgent->new(
-   encode => sub { my $c = shift; return $json->encode($c || {}) },
-);
-
-my $client = eval {
-   Percona::WebAPI::Client->new(
-      api_key => '123',
-      ua      => $ua,
-   );
-};
-
-is(
-   $EVAL_ERROR,
-   '',
-   'Create Client with mock user agent'
-) or die;
-
-my @ok;
-my $oktorun = sub {
-   return shift @ok;
-};
-
-my @wait;
-my $interval = sub {
-   my $t = shift;
-   push @wait, $t;
-};
-
-# #############################################################################
-# Init a new agent, i.e. create it.
-# #############################################################################
-
-my $post_agent = Percona::WebAPI::Resource::Agent->new(
-   uuid     => '123',
-   hostname => 'host1',
-   username => 'name1',
-   versions => {
-   },
-   links    => {
-      self   => '/agents/123',
-      config => '/agents/123/config',
-   },
-);
-
-my $return_agent = Percona::WebAPI::Resource::Agent->new(
-   uuid     => '123',
-   hostname => 'host2',
-   username => 'name2',
-   versions => {
-   },
-   links    => {
-      self   => '/agents/123',
-      config => '/agents/123/config',
-   },
-);
-
-$ua->{responses}->{post} = [
-   {
-      headers => { 'Location' => '/agents/123' },
-   },
-];
-
-$ua->{responses}->{get} = [
-   {
-      headers => { 'X-Percona-Resource-Type' => 'Agent' },
-      content => as_hashref($return_agent, with_links =>1 ),
-   },
-];
-
-my $got_agent;
-my $output = output(
-   sub {
-      ($got_agent) = pt_agent::init_agent(
-         agent    => $post_agent,
-         action   => 'post',
-         link     => "/agents",
-         client   => $client,
-         interval => $interval,
-         tries    => 4,
-      );
-   },
-   stderr => 1,
-);
-
-is(
-   $got_agent->hostname,
-   'host2',
-   'Got and returned Agent'
-) or diag($output, Dumper(as_hashref($got_agent, with_links => 1)));
-
-is(
-   scalar @wait,
-   0,
-   "Client did not wait (new Agent)"
-) or diag($output);
-
-# #############################################################################
-# Repeat this test but this time fake an error, so the tool isn't able
-# to create the Agent first time, so it should wait (call interval),
-# and try again.
-# #############################################################################
-
-$return_agent->{id}    = '456';
-$return_agent->{links} = {
-   self   => '/agents/456',
-   config => '/agents/456/config',
-};
-
-$ua->{responses}->{post} = [
-   {  # 1, the fake error
-      code => 500,  
-   },
-      # 2, code should call interval
-   {  # 3, code should try again, then receive this
-      code    => 200,
-      headers => { 'Location' => '/agents/456' },
-   },
-];
-      # 4, code will GET the new Agent
-$ua->{responses}->{get} = [
-   {
-      headers => { 'X-Percona-Resource-Type' => 'Agent' },
-      content => as_hashref($return_agent, with_links =>1 ),
-   },
-];
-
-@ok   = qw(1 1 0);
-@wait = ();
-@log  = ();                     
-$ua->{requests} = [];
-
-$output = output(
-   sub {
-      ($got_agent) = pt_agent::init_agent(
-         agent    => $post_agent,
-         action   => 'post',
-         link     => "/agents",
-         client   => $client,
-         interval => $interval,
-         tries    => 5,
-         oktorun  => $oktorun,
-      );
-   },
-   stderr => 1,
-);
-
-is(
-   ($got_agent ? $got_agent->hostname : ''),
-   'host2',
-   'Got and returned Agent after error'
-) or diag($output, Dumper($got_agent));
-
-is(
-   scalar @wait,
-   1,
-   "Client waited after error"
-);
-
-is_deeply(
-   $ua->{requests},
-   [
-      'POST /agents',     # first attempt, 500 error
-      'POST /agents',     # second attemp, 200 OK
-      'GET /agents/456',  # GET new Agent
-   ],
-   "POST POST GET new Agent after error"
-) or diag(Dumper($ua->{requests}));
-
-like(
-   $log[1],
-   qr{WARNING Failed to POST /agents},
-   "POST /agents failure logged after error"
-) or diag(Dumper($ua->{requests}), Dumper(\@log));
-
-# #############################################################################
-# Init an existing agent, i.e. update it.
-# #############################################################################
-
-my $put_agent = Percona::WebAPI::Resource::Agent->new(
-   uuid     => '123',
-   hostname => 'host3',
-   username => 'name3',
-   versions => {
-   },
-   links    => {
-      self   => '/agents/123',
-      config => '/agents/123/config',
-   },
-);
-
-$ua->{responses}->{put} = [
-   {
-      code    => 200,
-      headers => {
-         Location => '/agents/123',
-      },
-   },
-];
-$ua->{responses}->{get} = [
-   {
-      code    => 200,
-      headers => { 'X-Percona-Resource-Type' => 'Agent' },
-      content => as_hashref($return_agent, with_links =>1 ),
-   }
-];
-
-@wait = ();
-$ua->{requests} = [];
-
-$output = output(
-   sub {
-      ($got_agent) = pt_agent::init_agent(
-         agent    => $put_agent,
-         action   => 'put',
-         link     => "/agents/123",
-         client   => $client,
-         interval => $interval,
-         tries    => 4,
-      );
-   },
-   stderr => 1,
-);
-
-is(
-   $got_agent->hostname,
-   'host2',
-   'PUT Agent'
-) or diag($output, Dumper(as_hashref($got_agent, with_links => 1)));
-
-is(
-   scalar @wait,
-   0,
-   "Client did not wait (saved Agent)"
-);
-
-is_deeply(
-   $ua->{requests},
-   [
-      'PUT /agents/123',
-      'GET /agents/123',
-   ],
-   "PUT then GET Agent"
-) or diag(Dumper($ua->{requests}));
-
-# #############################################################################
-# Status 403 (too many agents) should abort further attempts.
-# #############################################################################
-
-$ua->{responses}->{post} = [
-   {  # 1, the fake error
-      code => 403,  
-   },
-];
-
-@ok   = qw(1 1 0);
-@wait = ();
-@log  = ();
-$ua->{requests} = [];
-
-$output = output(
-   sub {
-      ($got_agent) = pt_agent::init_agent(
-         agent    => $post_agent,
-         action   => 'post',
-         link     => "/agents",
-         client   => $client,
-         interval => $interval,
-         tries    => 3,
-         oktorun  => $oktorun,
-      );
-   },
-   stderr => 1,
-);
-
-is(
-   scalar @wait,
-   2,
-   "Too many agents (403): waits"
-);
-
-is_deeply(
-   $ua->{requests},
-   [
-      'POST /agents',
-      'POST /agents',
-   ],
-   "Too many agents (403): tries"
-) or diag(Dumper($ua->{requests}));
-
-my $n = grep { $_ =~ m/too many agents/ } @log;
-is(
-   $n,
-   1,
-   "Too many agents (403): does not repeat warning"
-) or diag(Dumper(\@log));
-
-# #############################################################################
-# Done.
-# #############################################################################
-done_testing;

=== removed file 't/pt-agent/make_new_crontab.t'
--- t/pt-agent/make_new_crontab.t	2013-04-19 20:49:01 +0000
+++ t/pt-agent/make_new_crontab.t	1970-01-01 00:00:00 +0000
@@ -1,151 +0,0 @@
-#!/usr/bin/env perl
-
-BEGIN {
-   die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
-      unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
-   unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
-};
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use Test::More;
-use JSON;
-use File::Temp qw(tempfile);
-
-use Percona::Test;
-require "$trunk/bin/pt-agent";
-
-Percona::Toolkit->import(qw(have_required_args Dumper));
-
-my $sample = "t/pt-agent/samples";
-
-sub test_make_new_crontab {
-   my (%args) = @_;
-   have_required_args(\%args, qw(
-      file
-      services
-   )) or die;
-   my $file     = $args{file};
-   my $services = $args{services};
-
-   my $crontab_list = slurp_file("$trunk/$sample/$file.in");
-
-   my $new_crontab = pt_agent::make_new_crontab(
-      services     => $services,
-      crontab_list => $crontab_list,
-      bin_dir      => '',
-   );
-
-   ok(
-      no_diff(
-         $new_crontab,
-         "$sample/$file.out",
-         cmd_output => 1,
-      ),
-      $args{name} || $file,
-   ) or diag($new_crontab);
-} 
-
-my $run0 = Percona::WebAPI::Resource::Task->new(
-   name    => 'query-history',
-   number  => '0',
-   program => 'pt-query-digest',
-   options => '--output json',
-   output  => 'spool',
-);
-
-my $svc0 = Percona::WebAPI::Resource::Service->new(
-   ts             => '100',
-   name           => 'query-history',
-   run_schedule   => '* 8 * * 1,2,3,4,5',
-   spool_schedule => '* 9 * * 1,2,3,4,5',
-   tasks          => [ $run0 ],
-);
-
-# Empty crontab, add the service.
-test_make_new_crontab(
-   file => "crontab001",
-   services => [ $svc0 ],
-);
-
-# Crontab has another line, add the service to it.
-test_make_new_crontab(
-   file => "crontab002",
-   services => [ $svc0 ],
-);
-
-# Crontab has another line and an old service, remove the old service
-# and add the current service.
-test_make_new_crontab(
-   file => "crontab003",
-   services => [ $svc0 ],
-);
-
-# Crontab has old service, remove it and add only new service.
-test_make_new_crontab(
-   file => "crontab004",
-   services => [ $svc0 ],
-);
-
-# #############################################################################
-# Use real crontab.
-# #############################################################################
-
-# The previous tests pass in a crontab file to make testing easier.
-# Now test that make_new_crontab() will run `crontab -l' if not given
-# input.  To test this, we add a fake line to our crontab.  If
-# make_new_crontab() really runs `crontab -l', then this fake line
-# will be in the new crontab it returns.
-
-my $crontab = `crontab -l 2>/dev/null`;
-SKIP: {
-   skip 'Crontab is not empty', 3 if $crontab;
-
-   # On most systems[1], crontab lines must end with a newline,
-   # else an error like this happens:
-   #   "/tmp/new_crontab_file":1: premature EOF
-   #   errors in crontab file, can't install.
-   # [1] Ubuntu 10 and Mac OS X work without the newline. 
-   my ($fh, $file) = tempfile();
-   print {$fh} "* 0  *  *  *  date > /dev/null\n";
-   close $fh or warn "Cannot close $file: $OS_ERROR";
-   my $output = `crontab $file 2>&1`;
-
-   $crontab = `crontab -l 2>&1`;
-
-   is(
-      $crontab,
-      "* 0  *  *  *  date > /dev/null\n",
-      "Set other crontab line"
-   ) or diag($output);
-
-   unlink $file or warn "Cannot remove $file: $OS_ERROR";
-
-   my $new_crontab = pt_agent::make_new_crontab(
-      services => [ $svc0 ],
-      bin_dir  => '',
-   );
-
-   is(
-      $new_crontab,
-      "* 0  *  *  *  date > /dev/null
-* 8 * * 1,2,3,4,5 pt-agent --run-service query-history
-* 9 * * 1,2,3,4,5 pt-agent --send-data query-history
-",
-      "Runs crontab -l by default"
-   );
-
-   system("crontab -r 2>/dev/null");
-   $crontab = `crontab -l 2>/dev/null`;
-   is(
-      $crontab,
-      "",
-      "Removed crontab"
-   );
-};
-
-# #############################################################################
-# Done.
-# #############################################################################
-done_testing;

=== removed file 't/pt-agent/replace_special_vars.t'
--- t/pt-agent/replace_special_vars.t	2013-06-17 00:28:18 +0000
+++ t/pt-agent/replace_special_vars.t	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-#!/usr/bin/env perl
-
-BEGIN {
-   die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
-      unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
-   unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
-};
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use Test::More;
-use JSON;
-use File::Temp qw(tempfile);
-
-use Percona::Test;
-use Percona::Test::Mock::AgentLogger;
-require "$trunk/bin/pt-agent";
-
-Percona::Toolkit->import(qw(have_required_args Dumper));
-
-my @log;
-my $logger = Percona::Test::Mock::AgentLogger->new(log => \@log);
-pt_agent::_logger($logger);
-
-my @output_files = ();
-my $store        = {};
-
-sub test_replace {
-   my (%args) = @_;
-   have_required_args(\%args, qw(
-      cmd
-      expect
-   )) or die;
-   my $cmd    = $args{cmd};
-   my $expect = $args{expect};
-
-   my $new_cmd = pt_agent::replace_special_vars(
-      cmd          => $cmd,
-      output_files => \@output_files,
-      service      => 'service-name',
-      lib_dir      => '/var/lib/pt-agent',
-      meta_dir     => '/var/lib/pt-agent/meta',
-      stage_dir    => '/var/spool/.tmp',
-      spool_dir    => '/var/spool',
-      bin_dir      => $trunk,
-      ts           => '123',
-      store        => $store,
-   );
-
-   is(
-      $new_cmd,
-      $expect,
-      $cmd,
-   );
-};
-
-@output_files = qw(zero one two);
-test_replace(
-   cmd    => "pt-query-digest __RUN_0_OUTPUT__",
-   expect => "pt-query-digest zero",
-);
-
-$store->{slow_query_log_file} = 'slow.log';
-test_replace(
-   cmd    => "echo '__STORE_slow_query_log_file__' > /var/spool/pt-agent/.tmp/1371269644.rotate-slow-query-log-all-5.1.slow_query_log_file",
-   expect => "echo 'slow.log' > /var/spool/pt-agent/.tmp/1371269644.rotate-slow-query-log-all-5.1.slow_query_log_file",
-);
-
-# #############################################################################
-# Done.
-# #############################################################################
-done_testing;

=== removed file 't/pt-agent/run_agent.t'
--- t/pt-agent/run_agent.t	2013-06-17 04:01:30 +0000
+++ t/pt-agent/run_agent.t	1970-01-01 00:00:00 +0000
@@ -1,527 +0,0 @@
-#!/usr/bin/env perl
-
-BEGIN {
-   die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
-      unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
-   unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
-};
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use Test::More;
-
-plan skip_all => "Need to make start-service testable";
-
-use JSON;
-use File::Temp qw(tempdir);
-
-use Percona::Test;
-use Sandbox;
-use Percona::Test::Mock::UserAgent;
-use Percona::Test::Mock::AgentLogger;
-require "$trunk/bin/pt-agent";
-
-my $dp  = new DSNParser(opts=>$dsn_opts);
-my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
-my $dsn = $sb->dsn_for('master');
-my $o   = new OptionParser();
-$o->get_specs("$trunk/bin/pt-agent");
-$o->get_opts();
-my $cxn = Cxn->new(
-   dsn_string   => $dsn,
-   OptionParser => $o,
-   DSNParser    => $dp,
-);
-
-Percona::Toolkit->import(qw(Dumper));
-Percona::WebAPI::Representation->import(qw(as_hashref));
-
-# Running the agent is going to cause it to schedule the services,
-# i.e. write a real crontab.  The test box/user shouldn't have a
-# crontab, so we'll warn and clobber it if there is one.
-my $crontab = `crontab -l 2>/dev/null`;
-if ( $crontab ) {
-   warn "Removing crontab: $crontab\n";
-   `crontab -r`;
-}
-
-# Fake --lib and --spool dirs.
-my $tmpdir = tempdir("/tmp/pt-agent.$PID.XXXXXX"); #, CLEANUP => 1);
-mkdir "$tmpdir/spool" or die "Error making $tmpdir/spool: $OS_ERROR";
-
-my @log;
-my $logger = Percona::Test::Mock::AgentLogger->new(log => \@log);
-pt_agent::_logger($logger);
-
-# #############################################################################
-# Create mock client and Agent
-# #############################################################################
-
-# These aren't the real tests yet: to run_agent, first we need
-# a client and Agent, so create mock ones.
-
-my $output;
-my $json = JSON->new->canonical([1])->pretty;
-$json->allow_blessed([]);
-$json->convert_blessed([]);
-
-my $ua = Percona::Test::Mock::UserAgent->new(
-   encode => sub { my $c = shift; return $json->encode($c || {}) },
-);
-
-my $client = eval {
-   Percona::WebAPI::Client->new(
-      api_key => '123',
-      ua      => $ua,
-   );
-};
-
-is(
-   $EVAL_ERROR,
-   '',
-   'Create mock client'
-) or die;
-
-my $agent = Percona::WebAPI::Resource::Agent->new(
-   uuid     => '123',
-   hostname => 'host',
-   username => 'user',
-   links    => {
-      self   => '/agents/123',
-      config => '/agents/123/config',
-   },
-);
-
-my $daemon = Daemon->new(
-   daemonzie => 0,
-);
-
-my @wait;
-my $interval = sub {
-   my $t = shift;
-   push @wait, $t;
-   print "interval=" . (defined $t ? $t : 'undef') . "\n";
-};
-
-# #############################################################################
-# Test run_agent
-# #############################################################################
-
-my $config = Percona::WebAPI::Resource::Config->new(
-   ts      => 1363720060,
-   name    => 'Default',
-   options => {
-      'lib'            => $tmpdir,          # required
-      'spool'          => "$tmpdir/spool",  # required
-      'check-interval' => "11",
-   },
-   links   => {
-      self     => '/agents/123/config',
-      services => '/agents/123/services',
-   },
-);
-
-my $run0 = Percona::WebAPI::Resource::Task->new(
-   name    => 'query-history',
-   number  => '0',
-   program => 'pt-query-digest',
-   options => '--output json',
-   output  => 'spool',
-);
-
-my $svc0 = Percona::WebAPI::Resource::Service->new(
-   ts             => 100,
-   name           => 'query-history',
-   run_schedule   => '1 * * * *',
-   spool_schedule => '2 * * * *',
-   tasks          => [ $run0 ],
-   links          => {
-      self => '/query-history',
-      data => '/query-history/data',
-   },
-);
-
-my $run1  = Percona::WebAPI::Resource::Task->new(
-   name    => 'start-query-history',
-   number  => '0',
-   program => 'echo "start-qh"',
-);
-
-my $start_qh = Percona::WebAPI::Resource::Service->new(
-   ts             => '100',
-   name           => 'start-query-history',
-   meta           => 1,
-   tasks          => [ $run1 ],
-   links          => {
-      self => '/query-history',
-      data => '/query-history/data',
-   },
-);
-
-$ua->{responses}->{get} = [
-   {
-      headers => { 'X-Percona-Resource-Type' => 'Config' },
-      content => as_hashref($config, with_links => 1),
-   },
-   {
-      headers => { 'X-Percona-Resource-Type' => 'Service' },
-      content => [
-         as_hashref($start_qh, with_links => 1),
-         as_hashref($svc0, with_links => 1),
-      ],
-   },
-];
-
-my $safeguards = Safeguards->new(
-   disk_bytes_free => 1024,
-   disk_pct_free   => 1,
-);
-
-# The only thing pt-agent must have is the API key in the config file,
-# everything else relies on defaults until the first Config is gotten
-# from Percona.
-my $config_file = pt_agent::get_config_file();
-unlink $config_file if -f $config_file;
-
-like(
-   $config_file,
-   qr/$ENV{LOGNAME}\/\.pt-agent.conf$/,
-   "Default config file is ~/.pt-agent.config"
-);
-
-pt_agent::write_config(
-   config => $config
-);
-
-diag(`echo 'api-key=123' >> $config_file`);
-
-is(
-   `cat $config_file`,
-   "check-interval=11\nlib=$tmpdir\nspool=$tmpdir/spool\napi-key=123\n",
-   "Write Config to config file"
-); 
-
-pt_agent::save_agent(
-   agent   => $agent,
-   lib_dir => $tmpdir,
-);
-
-my @ok_code = ();  # callbacks
-my @oktorun = (
-   1,  # 1st main loop check
-   0,  # 2nd main loop check
-);
-my $oktorun = sub {
-   my $ok = shift @oktorun;
-   print "oktorun=" . (defined $ok ? $ok : 'undef') . "\n";
-   my $code = shift @ok_code;
-   $code->() if $code;
-   return $ok
-};
-
-@wait = ();
-
-$output = output(
-   sub {
-      pt_agent::run_agent(
-         # Required args
-         agent       => $agent,
-         client      => $client,
-         daemon      => $daemon,
-         interval    => $interval,
-         lib_dir     => $tmpdir,
-         safeguards  => $safeguards,
-         Cxn         => $cxn,
-         # Optional args, for testing
-         oktorun     => $oktorun,
-         json        => $json,
-         bin_dir     => "$trunk/bin",
-      );
-   },
-   stderr => 1,
-);
-
-is(
-   scalar @wait,
-   1,
-   "Called interval once"
-);
-
-is(
-   $wait[0],
-   11,
-   "... used Config->options->check-interval"
-);
-
-ok(
-   -f "$tmpdir/services/query-history",
-   "Created services/query-history"
-) or diag($output);
-
-chomp(my $n_files = `ls -1 $tmpdir/services| wc -l | awk '{print \$1}'`);
-is(
-   $n_files,
-   2,
-   "... created services/query-history and services/start-query-history"
-);
-
-ok(
-   no_diff(
-      "cat $tmpdir/services/query-history",
-      "t/pt-agent/samples/service001",
-   ),
-   "query-history service file"
-);
-
-$crontab = `crontab -l 2>/dev/null`;
-like(
-   $crontab,
-   qr/pt-agent --run-service query-history$/m,
-   "Scheduled --run-service with crontab"
-) or diag(Dumper(\@log));
-
-like(
-   $crontab,
-   qr/pt-agent --send-data query-history$/m,
-   "Scheduled --send-data with crontab"
-) or diag(Dumper(\@log));
-exit;
-# #############################################################################
-# Run run_agent again, like the agent had been stopped and restarted.
-# #############################################################################
-
-$ua->{responses}->{get} = [
-   # First check, fail
-   {
-      code    => 500,
-   },
-   # interval
-   # 2nd check, init with latest Config and Services
-   {
-      headers => { 'X-Percona-Resource-Type' => 'Config' },
-      content => as_hashref($config, with_links => 1),
-   },
-   {
-      headers => { 'X-Percona-Resource-Type' => 'Service' },
-      content => [ as_hashref($svc0, with_links => 1) ],
-   },
-   # interval
-   # 3rd check, same Config and Services so nothing to do
-   {
-      headers => { 'X-Percona-Resource-Type' => 'Config' },
-      content => as_hashref($config, with_links => 1),
-   },
-   {
-      headers => { 'X-Percona-Resource-Type' => 'Service' },
-      content => [ as_hashref($svc0, with_links => 1) ],
-   },
-   # interval, oktorun=0
-];
-
-@oktorun = (
-   1,  # 1st main loop check
-       # First check, error 500
-   1,  # 2nd main loop check
-       # Init with latest Config and Services
-   1,  # 3rd main loop check
-       # Same Config and services
-   0,  # 4th main loop check
-);
-
-# Before the 3rd check, remove the config file (~/.pt-agent.conf) and
-# query-history service  file.  When the tool re-GETs these, they'll be
-# the same so it won't recreate them.  A bug here will cause these files to
-# exist again after running.
-$ok_code[2] = sub {
-   unlink "$config_file";
-   unlink "$tmpdir/services/query-history";
-   Percona::Test::wait_until(sub { ! -f "$config_file" });
-   Percona::Test::wait_until(sub { ! -f "$tmpdir/services/query-history" });
-};
-
-@wait = ();
-
-$output = output(
-   sub {
-      pt_agent::run_agent(
-         # Required args
-         agent       => $agent,
-         client      => $client,
-         daemon      => $daemon,
-         interval    => $interval,
-         lib_dir     => $tmpdir,
-         Cxn         => $cxn,
-         # Optional args, for testing
-         oktorun     => $oktorun,
-         json        => $json,
-      );
-   },
-   stderr => 1,
-);
-
-is_deeply(
-   \@wait,
-   [ 60, 11, 11 ],
-   "Got Config after error"
-) or diag(Dumper(\@wait));
-
-ok(
-   ! -f "$config_file",
-   "No Config diff, no config file change"
-);
-
-ok(
-   ! -f "$tmpdir/services/query-history",
-   "No Service diff, no service file changes"
-);
-
-my $new_crontab = `crontab -l 2>/dev/null`;
-is(
-   $new_crontab,
-   $crontab,
-   "Crontab is the same"
-);
-
-# #############################################################################
-# Test a run_once_on_start service
-# #############################################################################
-
-diag(`rm -f $tmpdir/* >/dev/null 2>&1`);
-diag(`rm -rf $tmpdir/services/*`);
-diag(`rm -rf $tmpdir/spool/*`);
-
-# When pt-agent manually runs --run-service test-run-at-start, it's going
-# to need an API key because it doesn't call its own run_service(), it runs
-# another instance of itself with system().  So put the fake API key in
-# the default config file.
-unlink $config_file if -f $config_file;
-diag(`echo "api-key=123" > $config_file`);
-
-$config = Percona::WebAPI::Resource::Config->new(
-   ts      => 1363720060,
-   name    => 'Test run_once_on_start',
-   options => {
-      'check-interval' => "15",
-      'lib'            => $tmpdir,
-      'spool'          => "$tmpdir/spool",
-      'pid'            => "$tmpdir/pid",
-      'log'            => "$tmpdir/log"
-   },
-   links   => {
-      self     => '/agents/123/config',
-      services => '/agents/123/services',
-   },
-);
-
-$run0 = Percona::WebAPI::Resource::Task->new(
-   name    => 'run-at-start',
-   number  => '0',
-   program => 'date',
-   output  => 'spool',
-);
-
-$svc0 = Percona::WebAPI::Resource::Service->new(
-   ts           => 100,
-   name         => 'test-run-at-start',
-   run_schedule => '0 0 1 1 *',
-   run_once     => 1,  # here's the magic
-   tasks        => [ $run0 ],
-   links        => {
-      self => '/query-history',
-      data => '/query-history/data',
-   },
-);
-
-$ua->{responses}->{get} = [
-   {
-      headers => { 'X-Percona-Resource-Type' => 'Config' },
-      content => as_hashref($config, with_links => 1),
-   },
-   {
-      headers => { 'X-Percona-Resource-Type' => 'Service' },
-      content => [ as_hashref($svc0, with_links => 1) ],
-   },
-   {
-      headers => { 'X-Percona-Resource-Type' => 'Config' },
-      content => as_hashref($config, with_links => 1),
-   },
-   {
-      headers => { 'X-Percona-Resource-Type' => 'Service' },
-      content => [ as_hashref($svc0, with_links => 1) ],
-   },
-];
-
-@wait    = ();
-@ok_code = ();  # callbacks
-@oktorun = (
-   1,  # 1st main loop check
-       # Run once
-   1,  # 2nd main loop check
-       # Don't run it again
-   0,  # 3d main loop check
-);
-
-$output = output(
-   sub {
-      pt_agent::run_agent(
-         # Required args
-         agent       => $agent,
-         client      => $client,
-         daemon      => $daemon,
-         interval    => $interval,
-         lib_dir     => $tmpdir,
-         Cxn         => $cxn,
-         # Optional args, for testing
-         oktorun     => $oktorun,
-         json        => $json,
-         bin_dir     => "$trunk/bin/",
-      );
-   },
-   stderr => 1,
-);
-
-Percona::Test::wait_for_files("$tmpdir/spool/test-run-at-start/test-run-at-start");
-
-like(
-   $output,
-   qr/Starting test-run-at-start service/,
-   "Ran service on start"
-);
-
-my @runs = $output =~ m/Starting test-run-at-start service/g;
-
-is(
-   scalar @runs,
-   1,
-   "... only ran it once"
-);
-
-chomp($output = `cat $tmpdir/spool/test-run-at-start/test-run-at-start 2>/dev/null`);
-ok(
-   $output,
-   "... service ran at start"
-) or diag($output);
-
-chomp($output = `crontab -l`);
-unlike(
-   $output,
-   qr/--run-service test-run-at-start/,
-   "... service was not scheduled"
-);
-
-# #############################################################################
-# Done.
-# #############################################################################
-
-# This shouldn't cause an error, but if it does, let it show up
-# in the results as an error.
-`crontab -r`;
-
-if ( -f $config_file ) {
-   unlink $config_file 
-      or warn "Error removing $config_file: $OS_ERROR";
-}
-
-done_testing;

=== removed file 't/pt-agent/run_service.t'
--- t/pt-agent/run_service.t	2013-06-17 00:28:18 +0000
+++ t/pt-agent/run_service.t	1970-01-01 00:00:00 +0000
@@ -1,503 +0,0 @@
-#!/usr/bin/env perl
-
-BEGIN {
-   die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
-      unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
-   unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
-};
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use Test::More;
-use JSON;
-use File::Temp qw(tempdir);
-
-$ENV{PTTEST_PRETTY_JSON} = 1;
-
-use Percona::Test;
-use Sandbox;
-use Percona::Test::Mock::UserAgent;
-use Percona::Test::Mock::AgentLogger;
-require "$trunk/bin/pt-agent";
-
-my $dp  = new DSNParser(opts=>$dsn_opts);
-my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
-my $dsn = $sb->dsn_for('master');
-my $o   = new OptionParser();
-$o->get_specs("$trunk/bin/pt-agent");
-$o->get_opts();
-
-Percona::Toolkit->import(qw(Dumper have_required_args));
-Percona::WebAPI::Representation->import(qw(as_hashref));
-
-my @log;
-my $logger = Percona::Test::Mock::AgentLogger->new(log => \@log);
-pt_agent::_logger($logger);
-
-my $sample = "t/pt-agent/samples";
-
-# Create fake spool and lib dirs.  Service-related subs in pt-agent
-# automatically add "/services" to the lib dir, but the spool dir is
-# used as-is.
-my $tmpdir = tempdir("/tmp/pt-agent.$PID.XXXXXX", CLEANUP => 1);
-output(
-   sub { pt_agent::init_lib_dir(lib_dir => $tmpdir) }
-);
-my $spool_dir = "$tmpdir/spool";
-
-sub write_svc_files {
-   my (%args) = @_;
-   have_required_args(\%args, qw(
-      services
-   )) or die;
-   my $services = $args{services};
-
-   my $output = output(
-      sub {
-         pt_agent::write_services(
-            sorted_services => { added => $services },
-            lib_dir         => $tmpdir,
-         );
-      },
-      stderr => 1,
-      die    => 1,
-   );
-}
-
-# #############################################################################
-# Create mock client and Agent
-# #############################################################################
-
-my $json = JSON->new->canonical([1])->pretty;
-$json->allow_blessed([]);
-$json->convert_blessed([]);
-
-my $ua = Percona::Test::Mock::UserAgent->new(
-   encode => sub { my $c = shift; return $json->encode($c || {}) },
-);
-
-# Create cilent, get entry links
-my $links = {
-   agents          => '/agents',
-   config          => '/agents/1/config',
-   services        => '/agents/1/services',
-   'query-history' => '/query-history',
-};
-
-$ua->{responses}->{get} = [
-   {
-      content => $links,
-   },
-];
-
-my $client = eval {
-   Percona::WebAPI::Client->new(
-      api_key => '123',
-      ua      => $ua,
-   );
-};
-is(
-   $EVAL_ERROR,
-   '',
-   'Create mock client'
-) or die;
-
-my $agent = Percona::WebAPI::Resource::Agent->new(
-   uuid     => '123',
-   hostname => 'prod1', 
-   links    => $links,
-);
-
-is_deeply(
-   as_hashref($agent),
-   {
-      uuid     => '123',
-      hostname => 'prod1',
-   },
-   'Create mock Agent'
-) or die;
-
-# #############################################################################
-# Simple single task service using a program.
-# #############################################################################
-
-my $run0 = Percona::WebAPI::Resource::Task->new(
-   name    => 'query-history',
-   number  => '0',
-   program => "__BIN_DIR__/pt-query-digest --output json $trunk/t/lib/samples/slowlogs/slow008.txt",
-   output  => 'spool',
-);
-
-my $svc0 = Percona::WebAPI::Resource::Service->new(
-   ts             => 100,
-   name           => 'query-history',
-   run_schedule   => '1 * * * *',
-   spool_schedule => '2 * * * *',
-   tasks          => [ $run0 ],
-);
-
-write_svc_files(
-   services => [ $svc0 ],
-);
-
-$ua->{responses}->{get} = [
-   {
-      headers => { 'X-Percona-Resource-Type' => 'Agent' },
-      content => as_hashref($agent, with_links => 1),
-   },
-];
-
-my $exit_status;
-my $output = output(
-   sub {
-      $exit_status = pt_agent::run_service(
-         api_key     => '123',
-         service     => 'query-history',
-         lib_dir     => $tmpdir,
-         spool_dir   => $spool_dir,
-         Cxn         => '',
-         # for testing:
-         client      => $client,
-         agent       => $agent,
-         entry_links => $links,
-         prefix      => '1',
-         json        => $json,
-         bin_dir     => "$trunk/bin",
-      );
-   },
-);
-
-ok(
-   no_diff(
-      "cat $tmpdir/spool/query-history/1.query-history.data",
-      "$sample/query-history/data001.json",
-      post_pipe => 'grep -v \'"name" :\'',
-   ),
-   "1 run: spool data (query-history/data001.json)"
-) or diag(
-   `ls -l $tmpdir/spool/query-history/`,
-   `cat $tmpdir/logs/query-history.run`,
-   Dumper(\@log)
-);
-
-chomp(my $n_files = `ls -1 $spool_dir/query-history/*.data | wc -l | awk '{print \$1}'`);
-is(
-   $n_files,
-   1,
-   "1 run: only wrote spool data"
-) or diag(`ls -l $spool_dir`);
-
-is(
-   $exit_status,
-   0,
-   "1 run: exit 0"
-);
-
-ok(
-   -f "$tmpdir/spool/query-history/1.query-history.meta",
-   "1 run: .meta file exists"
-);
-
-# #############################################################################
-# Service with two task, both using a program.
-# #############################################################################
-
-diag(`rm -rf $tmpdir/spool/* $tmpdir/services/*`);
-@log = ();
-
-# The result is the same as the previous single-run test, but instead of
-# having pqd read the slowlog directly, we have the first run cat the
-# log to a tmp file which pt-agent should auto-create.  Then pqd in run1
-# references this tmp file.
-
-$run0 = Percona::WebAPI::Resource::Task->new(
-   name    => 'cat-slow-log',
-   number  => '0',
-   program => "cat $trunk/t/lib/samples/slowlogs/slow008.txt",
-   output  => 'tmp',
-);
-
-my $run1 = Percona::WebAPI::Resource::Task->new(
-   name    => 'query-history',
-   number  => '1',
-   program => "__BIN_DIR__/pt-query-digest --output json __RUN_0_OUTPUT__",
-   output  => 'spool',
-);
-
-$svc0 = Percona::WebAPI::Resource::Service->new(
-   ts             => 100,
-   name           => 'query-history',
-   run_schedule   => '3 * * * *',
-   spool_schedule => '4 * * * *',
-   tasks          => [ $run0, $run1 ],
-);
-
-write_svc_files(
-   services => [ $svc0 ],
-);
-
-$ua->{responses}->{get} = [
-   {
-      headers => { 'X-Percona-Resource-Type' => 'Agent' },
-      content => as_hashref($agent, with_links => 1),
-   },
-];
-
-$output = output(
-   sub {
-      $exit_status = pt_agent::run_service(
-         api_key   => '123',
-         service   => 'query-history',
-         spool_dir => $spool_dir,
-         lib_dir   => $tmpdir,
-         Cxn       => '',
-         # for testing:
-         client      => $client,
-         agent       => $agent,
-         entry_links => $links,
-         prefix      => '2',
-         json        => $json,
-         bin_dir     => "$trunk/bin",
-      );
-   },
-);
-
-ok(
-   no_diff(
-      "cat $tmpdir/spool/query-history/2.query-history.data",
-      "$sample/query-history/data001.json",
-      post_pipe => 'grep -v \'"name" :\'',
-   ),
-   "2 runs: spool data (query-history/data001.json)"
-) or diag(
-   `ls -l $tmpdir/spool/query-history/`,
-   `cat $tmpdir/logs/query-history.run`,
-   Dumper(\@log)
-);
-
-chomp($n_files = `ls -1 $spool_dir/query-history/*.data | wc -l | awk '{print \$1}'`);
-is(
-   $n_files,
-   1,
-   "2 runs: only wrote spool data"
-) or diag(`ls -l $spool_dir`);
-
-is(
-   $exit_status,
-   0,
-   "2 runs: exit 0"
-);
-
-my @tmp_files = glob "$tmpdir/spool/.tmp/*";
-is_deeply(
-   \@tmp_files,
-   [],
-   "2 runs: temp file removed"
-);
-
-# #############################################################################
-# More realistc: 3 services, multiple tasks, using programs and queries.
-# #############################################################################
-
-SKIP: {
-   skip 'Cannot connect to sandbox master', 5 unless $dbh;
-   skip 'No HOME environment variable', 5 unless $ENV{HOME};
-
-   diag(`rm -rf $tmpdir/spool/* $tmpdir/services/*`);
-   @log = ();
-
-   my (undef, $old_genlog) = $dbh->selectrow_array("SHOW VARIABLES LIKE 'general_log_file'");
-
-   my $new_genlog = "$tmpdir/genlog";
-
-   # First service: set up
-   my $task00 = Percona::WebAPI::Resource::Task->new(
-      name    => 'disable-gen-log',
-      number  => '0',
-      query   => "SET GLOBAL general_log=OFF",
-   );
-   my $task01 = Percona::WebAPI::Resource::Task->new(
-      name    => 'set-gen-log-file',
-      number  => '1',
-      query   => "SET GLOBAL general_log_file='$new_genlog'",
-   );
-   my $task02 = Percona::WebAPI::Resource::Task->new(
-      name    => 'enable-gen-log',
-      number  => '2',
-      query   => "SET GLOBAL general_log=ON",
-   );
-   my $svc0 = Percona::WebAPI::Resource::Service->new(
-      ts             => 100,
-      name           => 'enable-gen-log',
-      run_schedule   => '1 * * * *',
-      spool_schedule => '2 * * * *',
-      tasks          => [ $task00, $task01, $task02 ],
-   );
-
-   # Second service: the actual service
-   my $task10 = Percona::WebAPI::Resource::Task->new(
-      name    => 'query-history',
-      number  => '1',
-      program => "$trunk/bin/pt-query-digest --output json --type genlog $new_genlog",
-      output  => 'spool',
-   );
-   my $svc1 = Percona::WebAPI::Resource::Service->new(
-      ts             => 100,
-      name           => 'query-history',
-      run_schedule   => '3 * * * *',
-      spool_schedule => '4 * * * *',
-      tasks          => [ $task10 ],
-   );
-
-   # Third service: tear down
-   my $task20 = Percona::WebAPI::Resource::Task->new(
-      name    => 'disable-gen-log',
-      number  => '0',
-      query   => "SET GLOBAL general_log=OFF",
-   );
-   my $task21 = Percona::WebAPI::Resource::Task->new(
-      name    => 'set-gen-log-file',
-      number  => '1',
-      query   => "SET GLOBAL general_log_file='$old_genlog'",
-   );
-   my $task22 = Percona::WebAPI::Resource::Task->new(
-      name    => 'enable-gen-log',
-      number  => '2',
-      query   => "SET GLOBAL general_log=ON",
-   );
-   my $svc2 = Percona::WebAPI::Resource::Service->new(
-      ts             => 100,
-      name           => 'disable-gen-log',
-      run_schedule   => '5 * * * *',
-      spool_schedule => '6 * * * *',
-      tasks          => [ $task20, $task21, $task22 ],
-   );
-
-   write_svc_files(
-      services => [ $svc0, $svc1, $svc2 ],
-   );
-
-   $ua->{responses}->{get} = [
-      {
-         headers => { 'X-Percona-Resource-Type' => 'Agent' },
-         content => as_hashref($agent, with_links => 1),
-      },
-      {
-         headers => { 'X-Percona-Resource-Type' => 'Agent' },
-         content => as_hashref($agent, with_links => 1),
-      },
-      {
-         headers => { 'X-Percona-Resource-Type' => 'Agent' },
-         content => as_hashref($agent, with_links => 1),
-      },
-   ];
-
-   my $cxn = Cxn->new(
-      dsn_string   => $dsn,
-      OptionParser => $o,
-      DSNParser    => $dp,
-   );
-
-   # Run the first service.
-   $output = output(
-      sub {
-         $exit_status = pt_agent::run_service(
-            api_key   => '123',
-            service   => 'enable-gen-log',
-            spool_dir => $spool_dir,
-            lib_dir   => $tmpdir,
-            Cxn       => $cxn,
-            # for testing:
-            client      => $client,
-            agent       => $agent,
-            entry_links => $links,
-            prefix      => '3',
-            json        => $json,
-            bin_dir     => "$trunk/bin",
-         );
-      },
-   );
-
-   my (undef, $genlog) = $dbh->selectrow_array(
-      "SHOW VARIABLES LIKE 'general_log_file'");
-   is(
-      $genlog,
-      $new_genlog,
-      "Task set MySQL var"
-   ) or diag($output);
-
-   # Pretend some time passes...
-
-   # The next service doesn't need MySQL, so it shouldn't connect to it.
-   # To check this, the genlog before running and after running should
-   # be identical.
-   `cp $new_genlog $tmpdir/genlog-before`;
-
-   # Run the second service.
-   $output = output(
-      sub {
-         $exit_status = pt_agent::run_service(
-            api_key   => '123',
-            service   => 'query-history',
-            spool_dir => $spool_dir,
-            lib_dir   => $tmpdir,
-            Cxn       => $cxn,
-            # for testing:
-            client      => $client,
-            agent       => $agent,
-            entry_links => $links,
-            prefix      => '4',
-            json        => $json,
-            bin_dir     => "$trunk/bin",
-         );
-      },
-   );
-
-   `cp $new_genlog $tmpdir/genlog-after`;
-   my $diff = `diff $tmpdir/genlog-before $tmpdir/genlog-after`;
-   is(
-      $diff,
-      '',
-      "Tasks didn't need MySQL, didn't connect to MySQL"
-   ) or diag($output);
-
-   # Pretend more time passes...
-
-   # Run the third service.
-   $output = output(
-      sub {
-         $exit_status = pt_agent::run_service(
-            api_key   => '123',
-            service   => 'disable-gen-log',
-            spool_dir => $spool_dir,
-            lib_dir   => $tmpdir,
-            Cxn       => $cxn,
-            # for testing:
-            client      => $client,
-            agent       => $agent,
-            entry_links => $links,
-            prefix      => '5',
-            json        => $json,
-            bin_dir     => "$trunk/bin",
-         );
-      },
-   );
-   
-   (undef, $genlog) = $dbh->selectrow_array(
-      "SHOW VARIABLES LIKE 'general_log_file'");
-   is(
-      $genlog,
-      $old_genlog,
-      "Task restored MySQL var"
-   ) or diag($output);
-
-   $dbh->do("SET GLOBAL general_log=ON");
-   $dbh->do("SET GLOBAL general_log_file='$old_genlog'");
-}
-
-# #############################################################################
-# Done.
-# #############################################################################
-done_testing;

=== removed directory 't/pt-agent/samples'
=== removed file 't/pt-agent/samples/crontab001.in'
=== removed file 't/pt-agent/samples/crontab001.out'
--- t/pt-agent/samples/crontab001.out	2013-03-19 22:35:37 +0000
+++ t/pt-agent/samples/crontab001.out	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-* 8 * * 1,2,3,4,5 pt-agent --run-service query-history
-* 9 * * 1,2,3,4,5 pt-agent --send-data query-history

=== removed file 't/pt-agent/samples/crontab002.in'
--- t/pt-agent/samples/crontab002.in	2013-01-08 17:55:58 +0000
+++ t/pt-agent/samples/crontab002.in	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-17 3 * * 1 cmd

=== removed file 't/pt-agent/samples/crontab002.out'
--- t/pt-agent/samples/crontab002.out	2013-03-19 22:35:37 +0000
+++ t/pt-agent/samples/crontab002.out	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-17 3 * * 1 cmd
-* 8 * * 1,2,3,4,5 pt-agent --run-service query-history
-* 9 * * 1,2,3,4,5 pt-agent --send-data query-history

=== removed file 't/pt-agent/samples/crontab003.in'
--- t/pt-agent/samples/crontab003.in	2013-01-08 17:55:58 +0000
+++ t/pt-agent/samples/crontab003.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-17 3 * * 1 cmd
-* * * * 1 pt-agent --run-service old-service
-

=== removed file 't/pt-agent/samples/crontab003.out'
--- t/pt-agent/samples/crontab003.out	2013-03-19 22:35:37 +0000
+++ t/pt-agent/samples/crontab003.out	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-17 3 * * 1 cmd
-* 8 * * 1,2,3,4,5 pt-agent --run-service query-history
-* 9 * * 1,2,3,4,5 pt-agent --send-data query-history

=== removed file 't/pt-agent/samples/crontab004.in'
--- t/pt-agent/samples/crontab004.in	2013-01-30 20:25:21 +0000
+++ t/pt-agent/samples/crontab004.in	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-1 * * * * pt-agent --run-service foo
-2 * * * * pt-agent --send-data foo

=== removed file 't/pt-agent/samples/crontab004.out'
--- t/pt-agent/samples/crontab004.out	2013-03-19 22:35:37 +0000
+++ t/pt-agent/samples/crontab004.out	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-* 8 * * 1,2,3,4,5 pt-agent --run-service query-history
-* 9 * * 1,2,3,4,5 pt-agent --send-data query-history

=== removed directory 't/pt-agent/samples/query-history'
=== removed file 't/pt-agent/samples/query-history/data001.json'
--- t/pt-agent/samples/query-history/data001.json	2013-11-08 03:03:01 +0000
+++ t/pt-agent/samples/query-history/data001.json	1970-01-01 00:00:00 +0000
@@ -1,152 +0,0 @@
-
-{
-   "classes" : [
-      {
-         "attribute" : "fingerprint",
-         "checksum" : "C72BF45D68E35A6E",
-         "distillate" : "SELECT tbl",
-         "example" : {
-            "Query_time" : "0.018799",
-            "query" : "SELECT MIN(id),MAX(id) FROM tbl",
-            "ts" : null
-         },
-         "fingerprint" : "select min(id),max(id) from tbl",
-         "histograms" : {
-            "Query_time" : [
-               0,
-               0,
-               0,
-               0,
-               1,
-               0,
-               0,
-               0
-            ]
-         },
-         "metrics" : {
-            "Lock_time" : {
-               "avg" : "0.009453",
-               "max" : "0.009453",
-               "median" : "0.009453",
-               "min" : "0.009453",
-               "pct" : "0.333333",
-               "pct_95" : "0.009453",
-               "stddev" : "0.000000",
-               "sum" : "0.009453"
-            },
-            "Query_length" : {
-               "avg" : "31",
-               "max" : "31",
-               "median" : "31",
-               "min" : "31",
-               "pct" : "0",
-               "pct_95" : "31",
-               "stddev" : "0",
-               "sum" : "31"
-            },
-            "Query_time" : {
-               "avg" : "0.018799",
-               "max" : "0.018799",
-               "median" : "0.018799",
-               "min" : "0.018799",
-               "pct" : "0.333333",
-               "pct_95" : "0.018799",
-               "stddev" : "0.000000",
-               "sum" : "0.018799"
-            },
-            "Rows_examined" : {
-               "avg" : "0",
-               "max" : "0",
-               "median" : "0",
-               "min" : "0",
-               "pct" : "0",
-               "pct_95" : "0",
-               "stddev" : "0",
-               "sum" : "0"
-            },
-            "Rows_sent" : {
-               "avg" : "0",
-               "max" : "0",
-               "median" : "0",
-               "min" : "0",
-               "pct" : "0",
-               "pct_95" : "0",
-               "stddev" : "0",
-               "sum" : "0"
-            },
-            "db" : {
-               "value" : "db2"
-            },
-            "host" : {
-               "value" : ""
-            },
-            "user" : {
-               "value" : "meow"
-            }
-         },
-         "query_count" : 1,
-         "tables" : [
-            {
-               "create" : "SHOW CREATE TABLE `db2`.`tbl`\\G",
-               "status" : "SHOW TABLE STATUS FROM `db2` LIKE 'tbl'\\G"
-            }
-         ]
-      }
-   ],
-   "global" : {
-      "files" : [
-         {
-            "size" : 656
-         }
-      ],
-      "metrics" : {
-         "Lock_time" : {
-            "avg" : "0.003151",
-            "max" : "0.009453",
-            "median" : "0.000000",
-            "min" : "0.000000",
-            "pct_95" : "0.009171",
-            "stddev" : "0.004323",
-            "sum" : "0.009453"
-         },
-         "Query_length" : {
-            "avg" : "24",
-            "max" : "31",
-            "median" : "26",
-            "min" : "14",
-            "pct_95" : "30",
-            "stddev" : "6",
-            "sum" : "72"
-         },
-         "Query_time" : {
-            "avg" : "0.006567",
-            "max" : "0.018799",
-            "median" : "0.000882",
-            "min" : "0.000002",
-            "pct_95" : "0.018157",
-            "stddev" : "0.008359",
-            "sum" : "0.019700"
-         },
-         "Rows_examined" : {
-            "avg" : "0",
-            "max" : "0",
-            "median" : "0",
-            "min" : "0",
-            "pct_95" : "0",
-            "stddev" : "0",
-            "sum" : "0"
-         },
-         "Rows_sent" : {
-            "avg" : "0",
-            "max" : "0",
-            "median" : "0",
-            "min" : "0",
-            "pct_95" : "0",
-            "stddev" : "0",
-            "sum" : "0"
-         }
-      },
-      "query_count" : 3,
-      "unique_query_count" : 3
-   }
-}

=== removed file 't/pt-agent/samples/query-history/data001.send'
--- t/pt-agent/samples/query-history/data001.send	2013-11-08 03:03:01 +0000
+++ t/pt-agent/samples/query-history/data001.send	1970-01-01 00:00:00 +0000
@@ -1,166 +0,0 @@
---Ym91bmRhcnk
-Content-Disposition: form-data; name="agent"
-
-{
-   "hostname" : "prod1",
-   "uuid" : "123"
-}
---Ym91bmRhcnk
-Content-Disposition: form-data; name="meta"
-
-
---Ym91bmRhcnk
-Content-Disposition: form-data; name="data"
-
-{
-   "classes" : [
-      {
-         "attribute" : "fingerprint",
-         "checksum" : "C72BF45D68E35A6E",
-         "distillate" : "SELECT tbl",
-         "example" : {
-            "Query_time" : "0.018799",
-            "query" : "SELECT MIN(id),MAX(id) FROM tbl",
-            "ts" : null
-         },
-         "fingerprint" : "select min(id),max(id) from tbl",
-         "histograms" : {
-            "Query_time" : [
-               0,
-               0,
-               0,
-               0,
-               1,
-               0,
-               0,
-               0
-            ]
-         },
-         "metrics" : {
-            "Lock_time" : {
-               "avg" : "0.009453",
-               "max" : "0.009453",
-               "median" : "0.009453",
-               "min" : "0.009453",
-               "pct" : "0.333333",
-               "pct_95" : "0.009453",
-               "stddev" : "0.000000",
-               "sum" : "0.009453"
-            },
-            "Query_length" : {
-               "avg" : "31",
-               "max" : "31",
-               "median" : "31",
-               "min" : "31",
-               "pct" : "0",
-               "pct_95" : "31",
-               "stddev" : "0",
-               "sum" : "31"
-            },
-            "Query_time" : {
-               "avg" : "0.018799",
-               "max" : "0.018799",
-               "median" : "0.018799",
-               "min" : "0.018799",
-               "pct" : "0.333333",
-               "pct_95" : "0.018799",
-               "stddev" : "0.000000",
-               "sum" : "0.018799"
-            },
-            "Rows_examined" : {
-               "avg" : "0",
-               "max" : "0",
-               "median" : "0",
-               "min" : "0",
-               "pct" : "0",
-               "pct_95" : "0",
-               "stddev" : "0",
-               "sum" : "0"
-            },
-            "Rows_sent" : {
-               "avg" : "0",
-               "max" : "0",
-               "median" : "0",
-               "min" : "0",
-               "pct" : "0",
-               "pct_95" : "0",
-               "stddev" : "0",
-               "sum" : "0"
-            },
-            "db" : {
-               "value" : "db2"
-            },
-            "host" : {
-               "value" : ""
-            },
-            "user" : {
-               "value" : "meow"
-            }
-         },
-         "query_count" : 1,
-         "tables" : [
-            {
-               "create" : "SHOW CREATE TABLE `db2`.`tbl`\\G",
-               "status" : "SHOW TABLE STATUS FROM `db2` LIKE 'tbl'\\G"
-            }
-         ]
-      }
-   ],
-   "global" : {
-      "files" : [
-         {
-            "size" : 656
-         }
-      ],
-      "metrics" : {
-         "Lock_time" : {
-            "avg" : "0.003151",
-            "max" : "0.009453",
-            "median" : "0.000000",
-            "min" : "0.000000",
-            "pct_95" : "0.009171",
-            "stddev" : "0.004323",
-            "sum" : "0.009453"
-         },
-         "Query_length" : {
-            "avg" : "24",
-            "max" : "31",
-            "median" : "26",
-            "min" : "14",
-            "pct_95" : "30",
-            "stddev" : "6",
-            "sum" : "72"
-         },
-         "Query_time" : {
-            "avg" : "0.006567",
-            "max" : "0.018799",
-            "median" : "0.000882",
-            "min" : "0.000002",
-            "pct_95" : "0.018157",
-            "stddev" : "0.008359",
-            "sum" : "0.019700"
-         },
-         "Rows_examined" : {
-            "avg" : "0",
-            "max" : "0",
-            "median" : "0",
-            "min" : "0",
-            "pct_95" : "0",
-            "stddev" : "0",
-            "sum" : "0"
-         },
-         "Rows_sent" : {
-            "avg" : "0",
-            "max" : "0",
-            "median" : "0",
-            "min" : "0",
-            "pct_95" : "0",
-            "stddev" : "0",
-            "sum" : "0"
-         }
-      },
-      "query_count" : 3,
-      "unique_query_count" : 3
-   }
-}
---Ym91bmRhcnk

=== removed file 't/pt-agent/samples/service001'
--- t/pt-agent/samples/service001	2013-06-17 04:01:30 +0000
+++ t/pt-agent/samples/service001	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-{
-   "links" : {
-      "data" : "/query-history/data",
-      "self" : "/query-history"
-   },
-   "name" : "query-history",
-   "run_schedule" : "1 * * * *",
-   "spool_schedule" : "2 * * * *",
-   "tasks" : [
-      {
-         "name" : "query-history",
-         "number" : "0",
-         "options" : "--output json",
-         "output" : "spool",
-         "program" : "pt-query-digest"
-      }
-   ],
-   "ts" : 100
-}

=== removed file 't/pt-agent/samples/write_services001'
--- t/pt-agent/samples/write_services001	2013-06-17 00:28:18 +0000
+++ t/pt-agent/samples/write_services001	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-{
-   "links" : {
-      "data" : "/query-history/data",
-      "self" : "/query-history"
-   },
-   "name" : "query-history",
-   "run_schedule" : "1 * * * *",
-   "spool_schedule" : "2 * * * *",
-   "tasks" : [
-      {
-         "name" : "query-history",
-         "number" : "0",
-         "options" : "--report-format profile slow008.txt",
-         "output" : "spool",
-         "program" : "pt-query-digest"
-      }
-   ],
-   "ts" : 100
-}

=== removed file 't/pt-agent/schedule_services.t'
--- t/pt-agent/schedule_services.t	2013-06-17 00:28:18 +0000
+++ t/pt-agent/schedule_services.t	1970-01-01 00:00:00 +0000
@@ -1,200 +0,0 @@
-#!/usr/bin/env perl
-
-BEGIN {
-   die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
-      unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
-   unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
-};
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use Test::More;
-use JSON;
-use File::Temp qw(tempfile tempdir);
-
-use Percona::Test;
-use Percona::Test::Mock::AgentLogger;
-require "$trunk/bin/pt-agent";
-
-my $crontab = `crontab -l 2>/dev/null`;
-if ( $crontab ) {
-   plan skip_all => 'Crontab is not empty';
-}
-
-Percona::Toolkit->import(qw(have_required_args Dumper));
-
-my $sample = "t/pt-agent/samples";
-my $tmpdir = tempdir("/tmp/pt-agent.$PID.XXXXXX", CLEANUP => 1);
-
-my @log;
-my $logger = Percona::Test::Mock::AgentLogger->new(log => \@log);
-pt_agent::_logger($logger);
-
-# #############################################################################
-# Schedule a good crontab.
-# #############################################################################
-
-my $run0 = Percona::WebAPI::Resource::Task->new(
-   name    => 'query-history',
-   number  => '0',
-   program => 'pt-query-digest',
-   options => '--output json',
-   output  => 'spool',
-);
-