Merge pull request #44 from sschneid/daily_clone_statistics

Store and retrieve daily clone statistics from Redis db

lib/vmpooler.rb

@@ -1,6 +1,7 @@
 require 'rubygems' unless defined?(Gem)
 
 module Vmpooler
+  require 'date'
   require 'json'
   require 'open-uri'
   require 'rbvmomi'

lib/vmpooler/api.rb

@@ -172,7 +172,6 @@ module Vmpooler
           content_type :json
 
           result = {}
-          clone_times = []
 
           result['capacity_current'] = 0
           result['capacity_total'] = 0
@@ -189,23 +188,19 @@ module Vmpooler
               result['empty'] ||= []
               result['empty'].push( pool['name'] )
             end
-
-            $redis.smembers( 'vmpooler__ready__'+pool['name'] ).each do |vm|
-              clone_time = $redis.hget( 'vmpooler__vm__'+vm, 'clone_time' )
-              clone_times.push( clone_time ) if clone_time.to_f > 0
-            end
           end
 
           if ( result['empty'] )
             result['status'] = 0
           end
 
-          if ( clone_times.any? )
-            result['clone_average'] = clone_times.map( &:to_f ).reduce( :+ ) / clone_times.size
-          end
-
           result['capacity_perecent'] = ( result['capacity_current'].to_f / result['capacity_total'].to_f ) * 100.0
 
+          result['clone_total'] = $redis.hlen('vmpooler__clone__'+Date.today.to_s)
+          if ( result['clone_total'] > 0 )
+            result['clone_average'] = $redis.hvals('vmpooler__clone__'+Date.today.to_s).map( &:to_f ).reduce( :+ ) / result['clone_total']
+          end
+
           JSON.pretty_generate(Hash[result.sort_by{|k,v| k}])
         end
 

lib/vmpooler/pool_manager.rb

@@ -230,6 +230,7 @@ module Vmpooler
           ).wait_for_completion
           finish = '%.2f' % (Time.now-start)
 
+          $redis.hset('vmpooler__clone__'+Date.today.to_s, vm['hostname'], finish)
           $redis.hset('vmpooler__vm__'+vm['hostname'], 'clone_time', finish)
 
           $logger.log('s', "[+] [#{vm['template']}] '#{vm['hostname']}' cloned from '#{vm['template']}' in #{finish} seconds")