fluent-plugin-nostat 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd29b9aae14064c027767a9f27d9012ee7d811bd
-  data.tar.gz: cafc6d0346c83f591b05f229a3dd80f4b640451c
+  metadata.gz: b677505412349ce2ed445ba002eb0c1de72ef4eb
+  data.tar.gz: 476324af36df2f7568245244782367661e137363
 SHA512:
-  metadata.gz: 2644490f692a735634fbe12b71d120b81e4204e81976ef5464f931095308bf4de130cf2854c8c0d3e353f7578973efc3b500b5ced474e97d3d02b7856100f0be
-  data.tar.gz: f516112e839b9cf2e4339d28f1f1e354afc4420414e68aca51df0ff634a0e745f9bddd8f8c2b12a5423094fddb06311c1267e6a0b140e0216f35486aa59ad771
+  metadata.gz: fff9be0487e8eccf175fc5f86fab0dfc5330f499f0868c591184f6d48a7688ece921fa155400305194f793ecf8199c673b1b456ba0d596c6310d66dd8e26c391
+  data.tar.gz: 4bfc7624620b4a0366c4057d89aff5db30cf31a798709abcaac192187af33f258405abe733661089bb8bcc79a18cdb2545215d2376d14123c58585e665be31f7

data/README.md

@@ -14,8 +14,12 @@ $ gem install fluent-plugin-nostat
 <source>
   type nostat
   run_interval 1
+  mode dstat # raw or dstat
 </source>
 ```
+* **mode** : raw or dstat.
+**raw** : just get the values from /proc/{STATS}.
+**dstat** : modify the values as dstat.
 
 ## output
 the raw stats from /proc directory.
@@ -24,9 +28,15 @@ the raw stats from /proc directory.
 * disk : sector - https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats
 * network : bytes - http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html
 
+### raw mode
 ```
 cpu={"usr"=>52773, "sys"=>28330, "idl"=>2217987, "wai"=>1995, "siq"=>4112, "hiq"=>0} disk={"sda"=>{"read"=>"9786551", "write"=>"29250018"}} net={"enp0s3"=>{"recv"=>8940623796, "send"=>383889456}, "enp0s8"=>{"recv"=>8940623796, "send"=>383889456}} mem={"total"=>1884188, "free"=>67968, "buff"=>0, "cach"=>1546820, "used"=>269400}
 ```
 
+### dstat mode
+```
+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}}
+```
+
 ## it was tested on
 . CentOS 7.x (kernel 3.10.x)

data/fluent-plugin-nostat.gemspec

@@ -1,19 +1,13 @@
 # -*- encoding: utf-8 -*-
-# stub: fluent-plugin-nostat 0.0.1 ruby lib
+# stub: fluent-plugin-nostat 0.0.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "fluent-plugin-nostat"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["No JinHo"]
-  s.date = "2016-03-15"
   s.email = "nozino@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
   s.files = [
     "Gemfile",
     "LICENSE.txt",
@@ -23,27 +17,8 @@ Gem::Specification.new do |s|
     "lib/fluent/plugin/in_nostat.rb",
   ]
   s.homepage = "http://github.com/nozino/fluent-plugin-nostat"
-  s.rubygems_version = "2.0.14"
-  s.summary = "Linux Resource Monitoring Input plugin for Fluent event collector"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  s.description = "Linux Resource Monitoring Input plugin for Fluent event collector"
+  s.summary = s.description
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fluent-mixin-rewrite-tag-name>, [">= 0"])
-      s.add_runtime_dependency(%q<fluentd>, [">= 0.10.7", "< 2"])
-      s.add_runtime_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-    else
-      s.add_runtime_dependency(%q<fluent-mixin-rewrite-tag-name>, [">= 0"])
-      s.add_runtime_dependency(%q<fluentd>, [">= 0.10.7", "< 2"])
-      s.add_runtime_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-    end
-  else
-    s.add_runtime_dependency(%q<fluent-mixin-rewrite-tag-name>, [">= 0"])
-    s.add_runtime_dependency(%q<fluentd>, [">= 0.10.7", "< 2"])
-    s.add_runtime_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-  end
-end
+  s.add_runtime_dependency "fluentd", [">= 0.10.7", "< 2"]
+end

data/lib/fluent/plugin/in_nostat.rb

@@ -1,5 +1,5 @@
 module Fluent
-  class NostatInput < Input
+n  class NostatInput < Input
     Plugin.register_input('nostat', self)
 
     @@CPU_STAT = "/proc/stat"
@@ -13,22 +13,26 @@ module Fluent
     @@CPU_WAI = 5
     @@CPU_HIQ = 6
     @@CPU_SIQ = 7
-    
+
+    @@LINUX_SECTOR_SIZE_BYTE = 512
+
+    @@history = {}
+
     def initialize
       super
       require 'fluent/timezone'
     end
-n
+
     config_param :tag_prefix, :string, :default => nil
     config_param :tag, :string, :default => nil
     config_param :run_interval, :time, :default => nil
+    config_param :mode, :string, :default => "raw"
 
     def configure(conf)
       super
 
       if !@tag
         @tag = @tag_prefix + `hostname`.strip.split('.')[0].strip + ".nostat"
-        log.info "tag=", @tag
       end
       if !@run_interval
         raise ConfigError, "'run_interval' option is required on df input"
@@ -36,6 +40,11 @@ n
     end
 
     def start
+      if ( @mode == "dstat" )
+        @@history = get_stats
+        sleep @run_interval
+      end
+
       @finished = false
       @thread = Thread.new(&method(:run_periodic))
     end
@@ -50,12 +59,12 @@ n
 
       first = File.foreach(@@CPU_STAT).first.split
 
-      res["usr"] = first[@@CPU_USR].strip.to_i
-      res["sys"] = first[@@CPU_SYS].strip.to_i
-      res["idl"] = first[@@CPU_IDL].strip.to_i
-      res["wai"] = first[@@CPU_WAI].strip.to_i
-      res["siq"] = first[@@CPU_SIQ].strip.to_i
-      res["hiq"] = first[@@CPU_HIQ].strip.to_i
+      res["usr"] = first[@@CPU_USR].strip.to_f
+      res["sys"] = first[@@CPU_SYS].strip.to_f
+      res["idl"] = first[@@CPU_IDL].strip.to_f
+      res["wai"] = first[@@CPU_WAI].strip.to_f
+      res["siq"] = first[@@CPU_SIQ].strip.to_f
+      res["hiq"] = first[@@CPU_HIQ].strip.to_f
 
       res
     end
@@ -63,14 +72,17 @@ n
     def get_mem_stat
       res = {}
       used = 0
+      total = 0
 
       File.foreach(@@MEM_STAT) do |line|
         items = line.split
         name = items[0].split(':').first
 
+
         case name
           when "MemTotal"
-          res["total"] = items[1].strip.to_i
+#          res["total"] = items[1].strip.to_i
+          total = items[1].strip.to_i
           when "MemFree"
           res["free"] = items[1].strip.to_i
           when "Buffers"
@@ -81,7 +93,7 @@ n
         end
       end
 
-      res["used"] = res["total"] - res["free"] - res["buff"] - res["cach"]
+      res["used"] = total - res["free"] - res["buff"] - res["cach"]
       res
     end
 
@@ -93,8 +105,8 @@ n
         if ( items[2] =~ /^[hsv]d[a-z]$/ )
           disk = {}
 
-          disk["read"] = items[5]
-          disk["write"] = items[9]
+          disk["read"] = items[5].strip.to_i
+          disk["write"] = items[9].strip.to_i
 
           res[items[2]] = disk
         end
@@ -128,17 +140,95 @@ n
       res
     end
 
+    def get_dstat_cpu (cpu_stat)
+      res = {}
+      total = 0
+      cpu_stat.each do |key, value|
+        res[key] = value - @@history["cpu"][key]
+        total += res[key]
+      end
+        
+      res.each do |key,value|
+        if ( key == "idl" )
+          res[key] = (res[key] / total * 100).floor
+        else
+          res[key] = (res[key] / total * 100).ceil
+        end
+      end
+      
+      res
+    end
+
+    def get_dstat_mem (mem_stat)
+      res = {}
+      mem_stat.each do |key, value|
+        res[key] = value * 1024
+      end
+
+      res
+    end
+
+    def get_dstat_disk (disk_stat)
+      res = {}
+      disk = {}
+
+      disk_stat.each do |key, value|
+        disk["read"] = (value["read"] - @@history["disk"][key]["read"]) * @@LINUX_SECTOR_SIZE_BYTE
+        disk["write"] = (value["write"] - @@history["disk"][key]["write"]) * @@LINUX_SECTOR_SIZE_BYTE
+        res[key] = disk
+      end
+
+      res
+    end
+
+    def get_dstat_net (net_stat)
+      res = {}
+      net = {}
+
+      net_stat.each do |key, value|
+        net["recv"] = (value["recv"] - @@history["net"][key]["recv"])
+        net["send"] = (value["send"] - @@history["net"][key]["send"])
+        res[key] = net
+      end
+
+      res
+    end
+
+    def get_dstat_record (stat)
+      record = {}
+      record["cpu"] = get_dstat_cpu (stat["cpu"])
+      record["mem"] = get_dstat_mem (stat["mem"])
+      record["disk"] = get_dstat_disk (stat["disk"])
+      record["net"] = get_dstat_net (stat["net"])
+
+      @@history = stat
+
+      record
+    end
+
+    def get_stats
+      stat = {}
+
+      stat["cpu"] = get_cpu_stat
+      stat["disk"] = get_disk_stat
+      stat["net"] = get_net_stat
+      stat["mem"] = get_mem_stat
+      
+      stat
+    end
+
     def run_periodic
       until @finished
         begin
           sleep @run_interval
 
-          record = {}
+          stat = get_stats
 
-          record["cpu"] = get_cpu_stat
-          record["disk"] = get_disk_stat
-          record["net"] = get_net_stat
-          record["mem"] = get_mem_stat
+          if (mode == "dstat")
+            record = get_dstat_record (stat)
+          else
+            record = stat
+          end
 
           emit_tag = @tag.dup
           time = Engine.now

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-nostat
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - No JinHo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: fluent-mixin-rewrite-tag-name
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -44,41 +30,11 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '2'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-description: 
+description: Linux Resource Monitoring Input plugin for Fluent event collector
 email: nozino@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.md
+extra_rdoc_files: []
 files:
 - Gemfile
 - LICENSE.txt