fluent-plugin-cloudstack 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c92a4aeaff4cab0e22f0ff7f69578c7a711e0bb9
-  data.tar.gz: 9444ac520fbe888d2e77d5b12dca4af6ee686012
+  metadata.gz: d9a3b997bae08e9b069c03ad5cfa34461ff6a104
+  data.tar.gz: 1814c3cbc8c8c8d4fe735d20187c4c030df69c65
 SHA512:
-  metadata.gz: a4c5c9c31f761dabbbd7aa292c42e53dab3ce76f63f20249550e07d05c3ee89106eeff2efdf4d1c493bf121bb0640844a04f7a096898ea9ff40c23729060f0ed
-  data.tar.gz: aa4332df87e596ab80709533d275929e2af0b37ece76cafcb116f1da3d19ad939bc7c15113af8c66e37358e005ba91282c5c34959d7835bd9b1ea42520b6ee18
+  metadata.gz: 00b67f6b78dea69ca5f84b31f43f7d3c372d569d132b986db4217e683fcfa72462ea5d0abd27e1a3b1ceea6f5112d1bf22e96a404f5dc61f9c288a98c4348fd5
+  data.tar.gz: 3f2f8665a01982c381e42c4c4112d573ac39e7deb0087b52ce6cd17fe07cd8fd230492d343fdd88ae2a0b99d47d20550e7008340ee7d7145a56604498a476ad7

data/README.textile

@@ -72,12 +72,13 @@ h2. Data Example
                                                 "state":"Completed",
                                                 "parentid":"0"}
 
-20131027T202108+0000    cloudstack.usages.vm_usage      1
-20131027T202108+0000    cloudstack.usages.memory_usage  512
-20131027T202108+0000    cloudstack.usages.cpu_usage     1
-20131027T202108+0000    cloudstack.usages.root_volume_usage     16106127360
-20131027T202108+0000    cloudstack.usages.data_volume_usage     42949672960
-20131027T202108+0000    cloudstack.usages.usages_per_service_offering.t1.micro          1
-20131027T202108+0000    cloudstack.usages.usages_per_disk_offering.Datadisk_40GB        1
+20131028T133511+0000    cloudstack.usages       {"vm_usage":1,
+                                                 "memory_usage":512,
+                                                 "cpu_usage":1,
+                                                 "root_volume_usage":16106127360,
+                                                 "data_volume_usage":42949672960,
+                                                 "t1.micro":1,
+                                                 "Datadisk_40GB":1}
+
 </pre>
 

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/fluent/plugin/in_cloudstack.rb

@@ -2,7 +2,7 @@ module Fluent
   class CloudStackInput < Input
     Fluent::Plugin.register_input("cloudstack", self)
 
-    INTERVAL_MIN = 300
+    INTERVAL_MIN = 10
 
     config_param :host
     config_param :path, :default =>'/client/api'
@@ -80,15 +80,7 @@ module Fluent
       usages = get_usages
       time = Engine.now
       output_tag = "#{@tag}.usages"
-      usages.each do |key, value|
-        if value.class == Hash
-          value.each do |key2, value2|
-            Engine.emit("#{output_tag}.#{key}.#{key2}", time, value2)
-          end
-        else
-          Engine.emit("#{output_tag}.#{key}", time, value)
-        end
-      end
+      Engine.emit("#{output_tag}", time, usages)
     end
 
     def get_new_events
@@ -123,32 +115,45 @@ module Fluent
 
       vms_responses = cs.list_virtual_machines(:domainid=>@domain_id)
       vms =  vms_responses["listvirtualmachinesresponse"]["virtualmachine"]
-      vms.each do |vm|
-        memory_usage += vm["memory"].to_i
-        cpu_usage += vm["cpunumber"].to_i
-        usages_per_service_offering[vm["serviceofferingname"]] += 1
+
+      if vms
+        vms.each do |vm|
+          memory_usage += vm["memory"].to_i
+          cpu_usage += vm["cpunumber"].to_i
+          usages_per_service_offering[vm["serviceofferingname"]] += 1
+        end
       end
 
       volumes_responses = cs.list_volumes(:domainid=>@domain_id)
       volumes =  volumes_responses["listvolumesresponse"]["volume"]
-      volumes.each do |volume|
-        case volume["type"]
-        when "ROOT"
-          root_volume_usage += volume["size"]
-        when "DATADISK"
-          data_volume_usage += volume["size"]
-          usages_per_disk_offering[volume["diskofferingname"].gsub(' ','_')] += 1
+
+      if volumes
+        volumes.each do |volume|
+          case volume["type"]
+          when "ROOT"
+            root_volume_usage += volume["size"]
+          when "DATADISK"
+            data_volume_usage += volume["size"]
+            usages_per_disk_offering[volume["diskofferingname"].gsub(' ','_')] += 1
+          end
         end
       end
 
-      results =  {:vm_usage             => vms.size,
+      results =  {:vm_usage                    => vms.size,
                   :memory_usage                => memory_usage,
                   :cpu_usage                   => cpu_usage,
                   :root_volume_usage           => root_volume_usage,
                   :data_volume_usage           => data_volume_usage,
-                  :usages_per_service_offering => usages_per_service_offering,
-                  :usages_per_disk_offering    => usages_per_disk_offering,
       }
+
+      usages_per_service_offering.each do |key,value|
+        results[key] = value
+      end
+      usages_per_disk_offering.each do |key,value|
+        results[key] = value
+      end
+
+      results
     end
 
     def cs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudstack
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Yuichi UEMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-27 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd