logstash-input-remote_proc 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80014c6e1cda441511aac73c775940faff81c73e
-  data.tar.gz: cc4b70a529900f8e028fef6fdeb9f0ef1987f963
+  metadata.gz: 4b2eabf983c6658e05c49e86955d1933b7650cec
+  data.tar.gz: ef9053b1f456c10cb5bdfaf188577b32456fd5bd
 SHA512:
-  metadata.gz: d5f7847aa949254171d09411c3e3990227e7327500f71542822c796503efea712439453ad373c51dfa7d2fdfa575ad947ad4b70cc92a50a7866e9cccf6f34e9a
-  data.tar.gz: 989081ac4ee05e0bad36bfa4aa00e70333c9c6e0bdd716ce502c3a21ec2e344a0a0d7d6c1bb7892914829ef41e0af053d993203cd3e04fb700954c751a052d7c
+  metadata.gz: 13615f9d28c1b8c7061025e40b09fc01cd6d519c7b37b29e56570ed4b36ba2b0b026b07629c39f0a27266cd219428a1b8e0d118b2caee3554ca159b93a376907
+  data.tar.gz: 4f6832667a2afe2c350f5ef18eff733da178b07feec1d31cd85784e1b5878852fc9c288f7ef550ee88bdb3e3c91a4e46c24b1dc4bc6e49f5c024d5c457649421

data/lib/logstash/inputs/remote_proc.rb

@@ -10,6 +10,7 @@ module LogStash
     #
     # Supported endpoints :
     #  * /proc/cpuinfo
+    #  * /proc/stat
     #  * /proc/meminfo
     #  * /proc/loadavg
     #  * /proc/vmstat
@@ -31,6 +32,21 @@ module LogStash
     #       { host => "remote.server.com" username => "medium" },
     #       { host => "h2.net" username => "poc" gateway_host => "h.gw.net" gateway_username => "user" }
     #     ]
+    #     proc_list => ["cpuinfo", "stat", "meminfo", "diskstats"]
+    #   }
+    # }
+    # -------------------------------------------------------------------------
+    #
+    # Example with `proc_list => ["_all"]` which is default.
+    # [source,ruby]
+    # -------------------------------------------------------------------------
+    # input {
+    #   remote_proc {
+    #     servers => [
+    #       { host => "remote.server.com" username => "medium" },
+    #       { host => "h2.net" username => "poc" gateway_host => "h.gw.net" gateway_username => "user" }
+    #     ]
+    #     proc_list => ["_all"]
     #   }
     # }
     # -------------------------------------------------------------------------
@@ -53,6 +69,7 @@ module LogStash
       # Liste of commands for each `/proc` endpoints.
       COMMANDS = {
         cpuinfo: 'cat /proc/cpuinfo',
+        stat: 'cat /proc/stat',
         meminfo: 'cat /proc/meminfo',
         loadavg: 'cat /proc/loadavg',
         vmstat: 'cat /proc/vmstat',
@@ -81,7 +98,7 @@ module LogStash
       # [source,ruby]
       # ------------------------------------------------------------------------
       # %w(
-      #   cpuinfo meminfo loadavg vmstat diskstats
+      #   cpuinfo stat meminfo loadavg vmstat diskstats
       #   netdev netwireless mounts crypto sysvipcshm
       #  )
       # ------------------------------------------------------------------------
@@ -405,6 +422,44 @@ module LogStash
         meminfo
       end
 
+      # Process STAT data.
+      # http://lxr.free-electrons.com/source/Documentation/filesystems/proc.txt#L1294
+      def proc_stat(data)
+        return {} unless data
+        stat = {}
+        data.split(/$/).each do |line|
+          m = /^(cpu[0-9]*|intr|ctxt|btime|processes|procs_running|procs_blocked|softirq)\s+(.*)/i.match(line)
+          next unless m
+          if m[1] =~ /^cpu[0-9]*$/i
+            m_sub = m[2].split(/\s+/)
+            if m_sub && m_sub.length >= 10
+              m_sub.map!(&:to_i)
+              stat[m[1]] = {
+                user: m_sub[0],
+                nice: m_sub[1],
+                system: m_sub[2],
+                idle: m_sub[3],
+                iowait: m_sub[4],
+                irq: m_sub[5],
+                softirq: m_sub[6],
+                steal: m_sub[7],
+                guest: m_sub[8],
+                guest_nice: m_sub[9]
+              }
+            end
+          elsif m[1] =~ /^ctxt|btime|processes|procs_running|procs_blocked$/i
+            stat[m[1]] = m[2].to_i
+          elsif m[1] =~ /^intr|softirq$/i
+            m_sub = m[2].split(/\s+/)
+            next if m_sub.empty?
+            total = m_sub.shift.to_i
+            stat[m[1]] = { total: total }
+            stat[m[1]][:subsequents] = m_sub.map!(&:to_i)
+          end
+        end
+        stat
+      end
+
       # Process CPUINFO data.
       def proc_cpuinfo(data)
         return {} unless data

data/logstash-input-remote_proc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-remote_proc'
-  s.version = '0.1.5'
+  s.version = '0.1.6'
   s.licenses = ['Apache-2.0']
   s.summary = 'This Logstash plugin collects PROCFS metrics through remote SSH servers.'
   s.description = 'This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-remote_proc
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Christian Kakesa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2016-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement