fluent-plugin-nostat 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df5b9f59e4c9da71926005bb407a454dfed765aa
-  data.tar.gz: 6b8eb04336f8c98eadc0cd122bdd12012c85f892
+  metadata.gz: 90b76a3a63ad5b11308798732e0d9478ec4f5901
+  data.tar.gz: c4af4b9b7d642605cb4878ed627dae32211a85c8
 SHA512:
-  metadata.gz: 1df4acbbf2182feb1bd65fb73212f9b5a02ea835014887c05745c4f883c8adaaf60010231d80f8640dc23344e42a7b7c88993f11fc455b7b934e9706bb05e0d4
-  data.tar.gz: 97b3299e5ed3a503212c02e02415675a3ea03f8a1aa9de7941be095717bf2d8556826c38dc769a3d8079cb8e1a7c0442de203d7f69ee9a6e8a8ebcb5df2fd5fb
+  metadata.gz: 3d60fe29f11d1ecb8dfaa4d3016553ea33f5c4f5843ff8dc3f531142f167d5d9b9b75cad76e6b0c1387eb5042e284f082a05852e0b3bb3b7a9f169951345c7a5
+  data.tar.gz: 00acffadc1a169db0364548e4958c27f19de0536e81c6c3f3452147ef3c66454f1e9f05318a6830b62838bb6cc209a880a931bad4bf405b7bcf3ee3e72c3f938

data/README.md

@@ -15,11 +15,14 @@ $ gem install fluent-plugin-nostat
   type nostat
   run_interval 1
   mode dstat # raw or dstat
+  output_type graphite # hash or graphite
 </source>
 ```
-* tag : If there is no tag, the tag will be "{tag_prefix}.{hostname}.nostat".
+* tag : If there is no tag value, the tag will be "{tag_prefix}.{hostname}.nostat".
 * run_interval : seconds
 * **mode** : raw or dstat. **raw** : just get the values from /proc/{STATS}. **dstat** : modify the values as dstat.
+* **output_type** : hash or graphite. **hash** : old version style. **graphite** : slice all output for grapite.
+* tag_prefix : If there is no tag value, the tag will be "{tag_prefix}.{hostname}.nostat".
 
 ## output
 ### raw mode
@@ -42,5 +45,46 @@ cpu={"usr"=>52773, "sys"=>28330, "idl"=>2217987, "wai"=>1995, "siq"=>4112, "hiq"
 cpu={"usr"=>0, "sys"=>0, "idl"=>100, "wai"=>0, "siq"=>0, "hiq"=>0} mem={"free"=>1693290496, "buff"=>0, "cach"=>60887040, "used"=>175230976} disk={"sda"=>{"read"=>0, "write"=>0}} net={"enp0s3"=>{"recv"=>344, "send"=>1668}, "enp0s8"=>{"recv"=>344, "send"=>1668}}
 ```
 
+### graphite output style
+* full configuration example
+```
+<source>
+  type nostat
+  tag_prefix graphite.
+  run_interval 60
+  mode dstat
+  output_type graphite
+</source>
+
+<match graphite.**>
+  type graphite
+  host 192.168.56.91
+  port 2003
+  tag_for prefix
+  remove_tag_prefix graphite
+  name_key_pattern ^*$
+</match>
+
+```
+
+* output
+```
+tag : record
+hostname.nostat.cpu : usr => 10
+hostname.nostat.cpu : sys => 0
+hostname.nostat.cpu : idl => 90
+hostname.nostat.cpu : wai => 0
+
+...
+
+hostname.nostat.mem : free => 1693290496
+hostname.nostat.mem : buff => 0
+hostname.nostat.mem : cach => 60887040
+hostname.nostat.mem : used => 175230976
+
+...
+
+```
+
 ## it was tested on
-. CentOS 7.x (kernel 3.10.x)
+. CentOS 7.x (kernel 3.10.x) with graphite

data/fluent-plugin-nostat.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: fluent-plugin-nostat 0.1.1 ruby lib
+# stub: fluent-plugin-nostat 0.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "fluent-plugin-nostat"
-  s.version = "0.1.1"
+  s.version = "0.2.1"
 
   s.require_paths = ["lib"]
   s.authors = ["No JinHo"]

data/lib/fluent/plugin/in_nostat.rb

@@ -1,3 +1,7 @@
+#
+# by nozino (nozino@gamil.com)
+#
+
 module Fluent
   class NostatInput < Input
     Plugin.register_input('nostat', self)
@@ -27,6 +31,7 @@ module Fluent
     config_param :tag, :string, :default => nil
     config_param :run_interval, :time, :default => nil
     config_param :mode, :string, :default => "raw"
+    config_param :output_type, :string, :default => "hash"
 
     def configure(conf)
       super
@@ -35,7 +40,7 @@ module Fluent
         @tag = @tag_prefix + `hostname`.strip.split('.')[0].strip + ".nostat"
       end
       if !@run_interval
-        raise ConfigError, "'run_interval' option is required on df input"
+        raise ConfigError, "'run_interval' option is required on nostat input"
       end
     end
 
@@ -217,6 +222,42 @@ module Fluent
       stat
     end
 
+    def emit_graphite_style (time, record)
+      # cpu
+      tag = @tag + ".cpu"
+      router.emit(tag, time, record["cpu"])
+      
+      # memory
+      tag = @tag + ".mem"
+      router.emit(tag, time, record["mem"])
+
+      # disk
+      tag_prefix = @tag + ".disk"
+
+      record["disk"].each do |key, value|
+        tag = tag_prefix + "." + key
+        router.emit(tag, time, value)
+      end
+      
+      # net
+      tag_prefix = @tag + ".net"
+
+      record["net"].each do |key, value|
+        tag = tag_prefix + "." + key
+        router.emit(tag, time, value)
+      end
+    end
+
+    def emit_record (time, record)
+      if @output_type == "graphite"
+        emit_graphite_style(time, record)
+      elsif @output_type == "hash"
+        router.emit(@tag, time, record)       
+      else
+        log.error "invalid output_type. output_type=", @output_type
+      end
+    end
+
     def run_periodic
       until @finished
         begin
@@ -230,10 +271,10 @@ module Fluent
             record = stat
           end
 
-          emit_tag = @tag.dup
           time = Engine.now
+          
+          emit_record(time,record)
 
-          router.emit(@tag, time, record)
         rescue => e
           log.error "nostat failed to emit", :error => e.to_s, :error_class => e.class.to_s, :tag => tag
           log.error "nostat to run or shutdown child process", :error => $!.to_s, :error_class => $!.class.to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-nostat
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - No JinHo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd