fluent-plugin-cloudstack 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1b3fe84c6b047c0be5aed92685fbd0a9e50cee9
-  data.tar.gz: 845d2684bbac4241d6223fe904106d27f30d6465
+  metadata.gz: ec43570ad8d36ae5a93b602fc89d77de5d0cbcac
+  data.tar.gz: d7ec531dd7bb504cf49a81f3c14b210da873e6d2
 SHA512:
-  metadata.gz: 09075542f30555c54f424700086f4e12e9ad5d13383d87fa88cd6ac0928e7b43ada244e31592298ddb1edd0acb4a73bce2e6a864946ad3fadae2b57a907bd1be
-  data.tar.gz: cb7a970cf48a855cc823d8e0345aea5c388f3b9db1c4d759c9a833d4b5bca6b9797b8aa8dd6e4055f77b544aa4dba52563077dd1b8cf4138a7f12637ffcd3fe6
+  metadata.gz: b40c4a9006bddc2c70b2e0f64d459153b55d08d97038258be3d2a809a1976928228de25e02319a0a279d99c50fd47978707fcb8b45ce0b4b08bb371b64c6098f
+  data.tar.gz: e21241dce0a24a0f7d7d70193c9eda9183fafdae18a74cf98ff90f2c2d7cc4f39a40c3518ae590cf5247669c0874509100cb45f6e3b5d2d9d2c21edf6ab40e97

data/README.textile

@@ -58,6 +58,10 @@ h2. Configuration
 </pre>
 
 
+h2. Usage Sample
+
+https://github.com/u-ichi/fluent-plugin-cloudstack-sample
+
 
 h2. Data Example
 

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/fluent-plugin-cloudstack.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |gem|
   gem.authors     = ["Yuichi UEMURA"]
   gem.email       = ["yuichi.u@gmail.com"]
   gem.homepage    = "https://github.com/u-ichi/fluent-plugin-cloudstack"
-  gem.summary     = %q{cloudstack plugin for fluentd, a log collector}
-  gem.description = %q{cloudstack plugin for fluentd, a log collector}
+  gem.summary     = %q{Fluentd input plugin to get usages and events from CloudStack API}
+  gem.description = %q{Fluentd input plugin to get usages and events from CloudStack API}
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/fluent/plugin/in_cloudstack.rb

@@ -46,6 +46,13 @@ module Fluent
         @before_events = nil
       end
 
+      @before_usages_filepath = "logs/before_usages.yml"
+      if File.exist?(@before_usages_filepath)
+        @before_usages = YAML.load_file(@before_usages_filepath)
+      else
+        @before_usages = Hash.new
+      end
+
       @event_output_tag = "#{@tag}.event"
       @usages_output_tag = "#{@tag}.usages"
 
@@ -142,25 +149,27 @@ module Fluent
             usages_per_disk_offering[volume["diskofferingname"].gsub(' ','_')] += 1
           end
         end
-      else
-        volumes = []
       end
 
-      results =  {:vm_sum                    => vms.size,
-                  :memory_sum                => memory_sum,
-                  :cpu_sum                   => cpu_sum,
-                  :root_volume_sum           => root_volume_sum,
-                  :data_volume_sum           => data_volume_sum,
-      }
+      usages = @before_usages
+
+      usages[:vm_sum]          = vms.size
+      usages[:memory_sum]      = memory_sum
+      usages[:cpu_sum]         = cpu_sum
+      usages[:root_volume_sum] = root_volume_sum
+      usages[:data_volume_sum] = data_volume_sum
 
       usages_per_service_offering.each do |key,value|
-        results[key] = value
+        usages[key] = value
       end
       usages_per_disk_offering.each do |key,value|
-        results[key] = value
+        usages[key] = value
       end
 
-      results
+      File.write(@before_usages_filepath, usages.to_yaml)
+      @before_usages = usages
+
+      usages
     end
 
     def cs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudstack
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Yuichi UEMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -66,7 +66,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: cloudstack plugin for fluentd, a log collector
+description: Fluentd input plugin to get usages and events from CloudStack API
 email:
 - yuichi.u@gmail.com
 executables: []
@@ -105,7 +105,7 @@ rubyforge_project:
 rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
-summary: cloudstack plugin for fluentd, a log collector
+summary: Fluentd input plugin to get usages and events from CloudStack API
 test_files:
 - test/plugin/in_cloudstack.rb
 - test/test_helper.rb