fluent-plugin-munin-node 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b2f43a0abffec39896ac67cc928983f906c1efa
-  data.tar.gz: 5341b9a712d6666a328196eed80997ee44d059cf
+  metadata.gz: 5c9894aedd7f5e65474011a7c44cadeb75a97e5c
+  data.tar.gz: 763b74a60b945d4a8697cd5866acced390574e5a
 SHA512:
-  metadata.gz: d91d6b699ee07ac0588a277444b003ab94c9c00137f5f17265342d13d35364966bf317889b461ea01db4e40d7a1c30d5733290988269764cc623434c5e63430c
-  data.tar.gz: b057cf26faf1dd9e57c34dcaeef3bbe5c1dfad05ce6835560d70e858e5947089c9c43135379025f1e9af09458fd81b43ee2be15d2e3dd25b494699b70af648a7
+  metadata.gz: 806b3445ba8870f463f0f32ba02d73c53da0bda261d23a91f19fb1f6a763effe82742ed2f5060b8511de3900ddeae88ca88e49f73f1066b59c60792691a64006
+  data.tar.gz: bdc1efccffada695ab93397604400a7cf5a51f6b390978f770db6bbec5f5917935ae1653f42d49a181726c5139d40bcceaf8e9cffa5f65e853c11949dee2239a

data/README.md

@@ -37,6 +37,8 @@ Or install it yourself as:
   #value_key value
   #extra {}
   #bulk false
+  #include_service (cpu|entropy) # regular expression
+  #exclude_service df.*          # regular expression
 </source>
 ```
 

data/lib/fluent/plugin/in_munin_node.rb

@@ -11,16 +11,18 @@ class Fluent::MuninNodeInput < Fluent::Input
     define_method('router') { Fluent::Engine }
   end
 
-  config_param :node_host,   :string,  :default => '127.0.0.1'
-  config_param :node_port,   :integer, :default => 4949
-  config_param :interval,    :time,    :default => 60
-  config_param :tag_prefix,  :string,  :default => 'munin'
-  config_param :bulk_suffix, :string,  :default => 'metrics'
-  config_param :service_key, :string,  :default => 'service'
-  config_param :field_key,   :string,  :default => 'field'
-  config_param :value_key,   :string,  :default => 'value'
-  config_param :extra,       :hash,    :default => {}
-  config_param :bulk,        :bool,    :default => false
+  config_param :node_host,       :string,  :default => '127.0.0.1'
+  config_param :node_port,       :integer, :default => 4949
+  config_param :interval,        :time,    :default => 60
+  config_param :tag_prefix,      :string,  :default => 'munin'
+  config_param :bulk_suffix,     :string,  :default => 'metrics'
+  config_param :service_key,     :string,  :default => 'service'
+  config_param :field_key,       :string,  :default => 'field'
+  config_param :value_key,       :string,  :default => 'value'
+  config_param :extra,           :hash,    :default => {}
+  config_param :bulk,            :bool,    :default => false
+  config_param :include_service, :string,  :default => nil
+  config_param :exclude_service, :string,  :default => nil
 
   def initialize
     super
@@ -29,6 +31,9 @@ class Fluent::MuninNodeInput < Fluent::Input
 
   def configure(conf)
     super
+
+    @include_service = Regexp.new(@include_service) if @include_service
+    @exclude_service = Regexp.new(@exclude_service) if @exclude_service
   end
 
   def start
@@ -44,7 +49,7 @@ class Fluent::MuninNodeInput < Fluent::Input
     @loop.watchers.each(&:detach)
     @loop.stop
 
-    # XXX: Comment out for exit soon. Is it OK?
+    # XXX: Comment out for exit quickly. Is it OK?
     #@thread.join
   end
 
@@ -60,10 +65,11 @@ class Fluent::MuninNodeInput < Fluent::Input
   def fetch_items
     values_by_service = {}
 
-    # It's connected every fetch of metrics.
+    # It connect to Munin node every time.
     node = Munin::Node.new(@node_host, @node_port)
+    services = filter_service(node.list)
 
-    node.list.each do |service|
+    services.each do |service|
       begin
         service_values = node.fetch(service)
         values_by_service.update(service_values)
@@ -77,11 +83,9 @@ class Fluent::MuninNodeInput < Fluent::Input
   end
 
   def emit_items(values_by_service)
-    time = Time.now
-
     if @bulk
       tag = @tag_prefix + '.' + @bulk_suffix
-      router.emit(tag, time.to_i, values_by_service.merge(extra))
+      router.emit(tag, Fluent::Engine.now, values_by_service.merge(extra))
     else
       values_by_service.each do |service, value_by_field|
         value_by_field.each do |fieldname, value|
@@ -93,12 +97,28 @@ class Fluent::MuninNodeInput < Fluent::Input
             @value_key => value =~ /\./ ? value.to_f : value.to_i,
           }
 
-          router.emit(tag, time.to_i, record.merge(extra))
+          router.emit(tag, Fluent::Engine.now, record.merge(extra))
         end
       end
     end
   end
 
+  def filter_service(services)
+    if @exclude_service
+      services = services.reject do |srvc|
+        srvc =~ @exclude_service
+      end
+    end
+
+    if @include_service
+      services = services.select do |srvc|
+        srvc =~ @include_service
+      end
+    end
+
+    services
+  end
+
   class TimerWatcher < Coolio::TimerWatcher
     def initialize(interval, repeat, log, &callback)
       @callback = callback

data/lib/fluent_plugin_munin_node/version.rb

@@ -1,3 +1,3 @@
 module FluentPluginMuninNode
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-munin-node
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd