logstash-input-remote_proc 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8104ecd742f611ddf8d1649d610f37cdcfb70b3f
-  data.tar.gz: 0f22c8b4501afb2779aee032e7a29901f3881e5d
+  metadata.gz: 39e455167eaf2062169a3710062f1c8bfbf8ca88
+  data.tar.gz: 928f9c46a49aeb73f05328284f7be026523c2c25
 SHA512:
-  metadata.gz: 37d86d83e6aefc37b7e10e0e11ffd3c470b0a6d4f0fbfc38dc08941b46f18021602b9d3a887b32625036d2cd27922dfc648b7197be3a3c3082410601be0391b1
-  data.tar.gz: 49292d4e0474344a127dc1babbb1c32d5589ead59ade9eb7ff0a672d6f869dc7524bbab0baa2ba98bc5506d181f1822927933955a7a39c83d15ad02995cef2e0
+  metadata.gz: 900f910091a3e30167ef30ea60fec61c830539810f984d97f7a64f17bdb6a1cd2120bb1974f40310bf70ab9ee0249cf142e249e71640c2ae1bb9a34ab6d873eb
+  data.tar.gz: 7535627808c62951d5f553c2661731f84c3fca9591e8455460948c9d764e61b5a642c3c5048a9b199b0e6d8f0b7cb294737f0101a44c1030044ce42458db6595

data/lib/logstash/inputs/remote_proc.rb

@@ -271,11 +271,11 @@ module LogStash
       # Process SYSVIPCSHM data
       def proc_sysvipcshm(data)
         return {} unless data
-        lines = data.split(/$/)
-        _ = lines.shift # Remove column name line
+        lines = data.lines
         sysvipcshm = {}
-        lines.each do |l|
-          t = l.strip.split(/\s+/)
+        lines.drop(1).each do |l|
+          l.strip!
+          t = l.split(/\s+/)
           next if t.empty? || t.length < 16
           sysvipcshm[t[1]] = {} # shmid
           sysvipcshm[t[1]]['key'] = t[0]
@@ -302,10 +302,10 @@ module LogStash
         return {} unless data
         crypto = {}
         current_crypto = ''
-        data.split(/$/).each do |line|
-          l = line.strip
-          next if l.empty?
-          t = l.split(/\s+:\s+/)
+        data.each_line do |line|
+          line.strip!
+          next if line.empty?
+          t = line.split(/\s+:\s+/)
           next if t.empty? || t.length != 2
           if 'name'.eql?(t[0])
             current_crypto = t[1]
@@ -321,8 +321,9 @@ module LogStash
       def proc_mounts(data)
         return {} unless data
         mounts = {}
-        data.split(/$/).each do |line|
-          t = line.strip.split(/\s+/)
+        data.each_line do |line|
+          line.strip!
+          t = line.split(/\s+/)
           next if t.empty? || t.length < 6
           # mounted device name
           device = {}
@@ -340,12 +341,11 @@ module LogStash
       # Process NETWIRELESS data.
       def proc_netwireless(data)
         return {} unless data
-        lines = data.split(/$/)
-        _ = lines.shift # Remove first line
-        _ = lines.shift # Remove second line
+        lines = data.lines
         netwireless = {}
-        lines.each do |l|
-          t = l.strip.split(/[:\s]+/)
+        lines.drop(2).each do |l|
+          l.strip!
+          t = l.split(/[:\s]+/)
           next if t.empty? || t.length < 11 # Last column WE22 is often empty
           netwireless[t[0]] = {}
           netwireless[t[0]]['status'] = t[1].to_i
@@ -366,12 +366,11 @@ module LogStash
       # Process NETDEV data.
       def proc_netdev(data)
         return {} unless data
-        lines = data.split(/$/)
-        _ = lines.shift # Remove first line
-        _ = lines.shift # Remove second line
+        lines = data.lines
         netdev = {}
-        lines.each do |l|
-          t = l.strip.split(/[:\s]+/)
+        lines.drop(2).each do |l|
+          l.strip!
+          t = l.split(/[:\s]+/)
           next if t.empty? || t.length < 17
           netdev[t[0]] = {}
           netdev[t[0]]['rxbytes'] = t[1].to_i
@@ -400,8 +399,9 @@ module LogStash
       def proc_diskstats(data)
         return {} unless data
         diskstats = {}
-        data.split(/$/).each do |line|
-          t = line.strip.split(/\s+/)
+        data.each_line do |line|
+          line.strip!
+          t = line.split(/\s+/)
           next if t.empty? || t.length < 14
           diskstats[t[2]] = {} # device name
           diskstats[t[2]]['major number'] = t[0].to_i
@@ -425,7 +425,7 @@ module LogStash
       def proc_vmstat(data)
         return {} unless data
         vmstat = {}
-        data.split(/$/).each do |line|
+        data.each_line do |line|
           m = /([^\s]+)\s+(\d+)/.match(line)
           vmstat[m[1]] = m[2].to_i if m && m.length >= 3
         end
@@ -453,15 +453,12 @@ module LogStash
       def proc_meminfo(data)
         return {} unless data
         meminfo = {}
-        data.split(/$/).each do |line|
+        data.each_line do |line|
           m = /([^\n\t:]+)\s*:\s+(\d+)(\skb)?$/i.match(line)
           next unless m
           meminfo[m[1]] = m[2].to_i
           meminfo[m[1]] *= 1000 if m[3] # m[3] is not nil if `/KB/i` is found
         end
-        unless meminfo.empty?
-          meminfo['CalcMemUsed'] = meminfo['MemTotal'] - meminfo['MemFree']
-        end
         meminfo
       end
 
@@ -470,7 +467,7 @@ module LogStash
       def proc_stat(data)
         return {} unless data
         stat = {}
-        data.split(/$/).each do |line|
+        data.each_line 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
@@ -507,8 +504,9 @@ module LogStash
         return {} unless data
         cpuinfo = {} # TODO(fenicks): change to array
         num_cpu = 0
-        data.split(/$/).each do |line|
-          next if line.strip.empty?
+        data.each_line do |line|
+          line.strip!
+          next if line.empty?
           m = /([^\n\t:]+)\s*:\s+(.+)$/.match(line)
           next unless m
           # Apply filters

data/logstash-input-remote_proc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-remote_proc'
-  s.version = '0.6.0'
+  s.version = '0.7.0'
   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.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Christian Kakesa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement