logstash-input-remote_proc 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c02140e9d9c51731875a6506a1bdd0186c50b5d
-  data.tar.gz: fcd1d2f715390bba9b4bb71fed8c065d968e5b94
+  metadata.gz: 5fca24e5d1158779effdece8b7c0cafcf52f7150
+  data.tar.gz: 6c7ca10796ad5786a6c7c53407775dae0b06754f
 SHA512:
-  metadata.gz: f36c5471a1bf132ae0ef534c931c241e29e7ac1af2ead1f21a24d1233f8f12d14506cf686fa89349d47c111c86c0af03274e78fac23c75c6e88f913a0df81157
-  data.tar.gz: d27e517f6d4fbf25c20ece9eb6d8e42978c3c9c8305827593565b376c032013f2edba659b222bce91cd57fd810270a9deb82b173968c813ad4f6d6ca25b2ac92
+  metadata.gz: 98e493503bbbf1a5fefc5cc42cc792f0db95f8a18c20e4cf0c77755481a2a0150871908ef692be2685a4775073709999f327a1d5b8b7de59bf1bb37e0f523c97
+  data.tar.gz: 2816b99edcc52e08a151197ef2f5c81dabf7ae1f5b8bc588e44554392a6597176d390954e54d57919ee947057d90e12acd70051833c22cf081052cdf40712a62

data/lib/logstash/inputs/remote_proc.rb

@@ -134,52 +134,71 @@ module LogStash
         # we can abort the loop if stop? becomes true
         until stop?
           @ssh_sessions.each do |ssh|
-            ssh.open_channel do |chan|
-              chan.connection.options[:properties]['_commands'].each do |method, command|
-                result_data = String.new('')
-                error_data = String.new('')
+            ssh.properties['_commands'].each do |method, command|
+              ssh.open_channel do |chan|
                 chan.exec(command) do |ch, success|
-                  next unless success
+                  ch[:result_data] = String.new('')
+                  ch[:result_error] = String.new('')
+                  ch[:result_host] = ssh.properties['host']
+                  ch[:result_port] = ssh.properties['port']
+                  unless success
+                    @logger.warn('CHANNEL_EXEC_UNSUCCESS',
+                                 command: command,
+                                 host: ch[:result_host],
+                                 port: ch[:result_port])
+                    next
+                  end
                   # "on_data" called when the process writes to stdout
-                  ch.on_data { |_c, data| result_data << data }
+                  ch.on_data { |_c, data| ch[:result_data] << data }
+                  ch.on_process do |_c|
+                    unless ch[:result_error].empty?
+                      ch[:result_error].chomp!
+                      ch[:result_error] = ch[:result_error].force_encoding('UTF-8')
+                      @logger.warn(ch[:result_error])
+                      next
+                    end
+                    next if ch[:result_data].empty?
+                    result = send("proc_#{method}",
+                                  ch[:result_data].force_encoding('UTF-8'))
+                    next if result.empty?
+                    event = LogStash::Event.new(
+                      method => result,
+                      host: @host,
+                      type: @type || "system-#{method}",
+                      metric_name: "system-#{method}",
+                      remote_host: ch[:result_host],
+                      remote_port: ch[:result_port],
+                      command: command,
+                      message: ch[:result_data]
+                    )
+                    decorate(event)
+                    queue << event
+                  end
+                  ch.on_open_failed do |c, code, desc|
+                    @logger.warn('CHANNEL_OPEN_FAILED',
+                                 host: ch[:result_host],
+                                 channel: c,
+                                 code: code,
+                                 description: desc)
+                  end
                   # "on_extended_data", called when the process writes to stderr
-                  ch.on_extended_data { |_ch, _type, data| error_data << data }
+                  ch.on_extended_data do |_ch, _type, data|
+                    ch[:result_error] << data
+                  end
                   ch.on_close(&:close)
                 end
                 chan.wait
-                unless error_data.empty?
-                  error_data.chomp!
-                  error_data = error_data.force_encoding('UTF-8')
-                  @logger.warn(error_data)
-                  next
-                end
-                next if result_data.empty?
-                result = send("proc_#{method}",
-                              result_data.force_encoding('UTF-8'))
-                next if result.empty?
-                event = LogStash::Event.new(
-                  method => result,
-                  host: @host,
-                  type: @type || "system-#{method}",
-                  metric_name: "system-#{method}",
-                  remote_host: chan.connection.options[:properties]['host'],
-                  remote_port: chan.connection.options[:properties]['port'],
-                  command: command,
-                  message: result_data
-                )
-                decorate(event)
-                queue << event
               end
             end
-            ssh.loop
           end # @ssh_sessions block
+          @ssh_sessions.each(&:loop)
           Stud.stoppable_sleep(@interval) { stop? }
         end # until loop
       end # def run
 
       def stop
-        @ssh_sessions.map(&:close)
-        @ssh_gateways.map(&:shutdown!) unless @ssh_gateways.empty?
+        @ssh_sessions.each(&:close)
+        @ssh_gateways.each(&:shutdown!) unless @ssh_gateways.empty?
       end
 
       private
@@ -187,7 +206,7 @@ module LogStash
       # Return only valide property keys.
       def prepare_servers!(server)
         server.select! { |k| SERVER_OPTIONS.include?(k) }
-        server.merge!(SERVER_OPTIONS) { |_key_, old, _new_| old }
+        server.merge!(SERVER_OPTIONS) { |_key, old, _new| old }
         cmds = if (@proc_list - ['_all']).empty?
                  COMMANDS.dup
                else
@@ -197,7 +216,8 @@ module LogStash
         server['_commands'] = cmds.each do |k, v|
           cmds[k] = v % { system_reader: server['system_reader'],
                           proc_prefix_path: server['proc_prefix_path'] }
-        end.freeze
+        end
+        server['_commands'].freeze
       end
 
       # Prepare all server configuration

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.8'
+  s.version = '0.1.9'
   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.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Christian Kakesa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement