fluent-plugin-metricsense 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 87384bad8d55efdb43f5f68b3d66bcfdce31a003
-  data.tar.gz: 2efa753e4a092052ff567fd014d8004804cd5b1e
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZTQwODg5MWU4OTUwMWMyZjg3ZGViYmQxNDZjZTU3YjM5OGZkYmFhNw==
+  data.tar.gz: !binary |-
+    ZjEyM2NjYzQ5NjZjM2YzODBkMjg2MzcwODgwMjIyYzNjNzdkODI0Mw==
 SHA512:
-  metadata.gz: 99f6c382071ca9e4d26fefa8c3227d5558718750b6287c2eed7102e96c53aad1a6367271dc85d21aaf2b8f5b14773f0fbb90ade4eea4e4074d8263f90551e890
-  data.tar.gz: 0a42690cde3a828784025d0bbc914a4f23b8ac7ef0ff93bfc3ef4375651a5cac6953d988b0346f4d84360a5e2b0cba1d57eeac1c9c89b932defc10e14c126ffe
+  metadata.gz: !binary |-
+    NjJjOWY0ZWE2ZjNkNGMxNzBkOGM5ZWQ5YzZjMzEzNjBkOGE3ZDg4MGFlMWFk
+    M2ZjNDNlYmZmYTM4YjdmOGQ0MDcwYWI0MTU5NGY5YjY1NGRkNDkxYTU2NTVm
+    NThmOGNmN2ZmMjEyM2RhYzgwMGZlMGNjNzlmZTQ1NTllMmE3ZjA=
+  data.tar.gz: !binary |-
+    MTJlNmY0YmQ4ZWYzYTg4MTUyNjYwYmEwMGYwYmJjYzQ1NDVmZmIyZGI5ZjA1
+    YjNkNjk4ZTA4MzBiYzQ1YjIzMmJlZDZiZjVlYzAxNjEwMmIxMTY4YzA1YTBl
+    Mzc5MGY3ZjJmOWQwNDMwNzBmNDgyMjc2OGY3ODBiYmFmZDg1YWU=

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/fluent/plugin/out_metricsense.rb

@@ -228,10 +228,20 @@ module Fluent
       end
     end
 
+    class SegmentedTotalUpdater < AddUpdater
+      def initialize(original_mode)
+        super()
+        @mode = original_mode
+      end
+
+      attr_reader :mode
+    end
+
     AggregationKey = Struct.new(:tag, :time, :seg_val, :seg_key)
 
     def write(chunk)
-      counters = {}
+      simple_counters = {}
+      segmented_counters = {}
 
       # select sum(value) from chunk group by tag, time/60, seg_val, seg_key
       chunk.msgpack_each {|tag,time,value,segments,update_mode|
@@ -248,21 +258,34 @@ module Fluent
           updater = AddUpdater
         end
 
-        # total value
-        ak = AggregationKey.new(tag, time, nil, nil)
-        (counters[ak] ||= updater.new).add(value)
-
-        # segmented values
-        segments = Hash[segments] if segments.is_a?(Array)  # for backward compat
+        if segments.empty?
+          # simple values
+          ak = AggregationKey.new(tag, time, nil, nil)
+          (simple_counters[ak] ||= updater.new).add(value)
+        else
+          # segmented values
+          segments.each_pair {|seg_key,seg_val|
+            ak = AggregationKey.new(tag, time, seg_val, seg_key)
+            (segmented_counters[ak] ||= updater.new).add(value)
+          }
+        end
+      }
 
-        segments.each_pair {|seg_key,seg_val|
-          ak = AggregationKey.new(tag, time, seg_val, seg_key)
-          (counters[ak] ||= updater.new).add(value)
-        }
+      # calculate total value of segmented values
+      segmented_totals = {}
+      segmented_counters.each_pair {|ak,up|
+        ak = AggregationKey.new(ak.tag, ak.time, nil, nil)
+        (segmented_totals[ak] ||= SegmentedTotalUpdater.new(up.mode)).add(up.value)
       }
 
+      # simple_counters have higher priority than segmented_totals
+      counters = segmented_totals
+      counters.merge!(segmented_counters)
+      counters.merge!(simple_counters)
+
       data = []
       counters.each_pair {|ak,up|
+        p [ak.tag, ak.time, up.normalized_value(@normalize_factor), ak.seg_key, ak.seg_val, up.mode]
         data << [ak.tag, ak.time, up.normalized_value(@normalize_factor), ak.seg_key, ak.seg_val, up.mode]
       }
 

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-metricsense
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.4
 description: MetricSense - application metrics aggregation plugin for Fluentd
@@ -72,7 +72,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - README.rdoc
 - Rakefile
@@ -91,12 +91,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -106,3 +106,4 @@ signing_key:
 specification_version: 4
 summary: MetricSense - application metrics aggregation plugin for Fluentd
 test_files: []
+has_rdoc: false