logstash-input-remote_proc 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39e455167eaf2062169a3710062f1c8bfbf8ca88
-  data.tar.gz: 928f9c46a49aeb73f05328284f7be026523c2c25
+  metadata.gz: a010bf68dd597363d91b48e1ec8ca8382ceb079f
+  data.tar.gz: 2e5e21fc3012fc2b83246ad89c869f94fe5e6ae9
 SHA512:
-  metadata.gz: 900f910091a3e30167ef30ea60fec61c830539810f984d97f7a64f17bdb6a1cd2120bb1974f40310bf70ab9ee0249cf142e249e71640c2ae1bb9a34ab6d873eb
-  data.tar.gz: 7535627808c62951d5f553c2661731f84c3fca9591e8455460948c9d764e61b5a642c3c5048a9b199b0e6d8f0b7cb294737f0101a44c1030044ce42458db6595
+  metadata.gz: d47c1ef6f8d999216952664269ba85a91f58abd58a3e709edc5102c43b30ae4bcedcdbabf5e58f23d5f6ee7f8edeb9cc375ab8fbf60f0e524ba488819ff52b1f
+  data.tar.gz: 1787a3eaccd8c93cad687356f88ae4295bab73c555f2f5b9050551c33f73beb72f989e93232c8ad4a3d5581b200695635c631d852aeb554a19519bb631e58122

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 0.8.0
+ - Add *server_tags* in server options.
+
+## 0.7.0
+ - Code review: performance.
+
+## 0.6.0
+ - Update USAGE.md.
+
+## 0.5.0
+ - Fix /proc/stat parser for CPU data.
+
+## 0.4.0
+ - Fix gem dependencies.
+
+## 0.3.0
+ - Fix bug with logstash-core 5.1.1 with tests.
+
+## 0.2.0
+ - Code review. Add comments
+
+## 0.1.9
+ - Fix multiple procfs path.
+
 ## 0.1.8
  - Add 'proc_prefix_path' for each server.
 

data/README.md

@@ -2,6 +2,9 @@
 
 [![Travis Build Status](https://travis-ci.org/fenicks/logstash-input-remote_proc.svg)](https://travis-ci.org/fenicks/logstash-input-remote_proc)
 
+
+> Looking for how to use this plugin, go to the [USAGE.md](https://github.com/fenicks/logstash-input-remote_proc/blob/master/USAGE.md) page.
+
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.

data/USAGE.md

@@ -20,6 +20,7 @@ servers => [
         gateway_ssh_private_key => ...                         # :path (needed if no 'gateway_password'), empty by default
         system_reader => "cat"                                 # :string
         proc_prefix_path => "/proc"                            # :string
+        server_tags => "traefik"                               # :string (could be comma separated text)
     }
 ]
 ```
@@ -69,6 +70,7 @@ input {
     }
 }
 ```
+
 ### SSH server with specific system read command, 'cat' by default, and a specific procfs prefix path, '/proc' by default.
 
 ```javascript
@@ -103,6 +105,7 @@ input {
 ```
 
 ### With SSH server `host`, `port` and `username` and authenticate by password
+
 ```javascript
 input {
     remote_proc {
@@ -117,7 +120,9 @@ input {
     }
 }
 ```
+
 ### With SSH Gateway by with private key file and SSH `host` and `password`
+
 ```javascript
 input {
     remote_proc {
@@ -136,3 +141,35 @@ input {
     }
 }
 ```
+
+### Use server_tags
+
+```javascript
+input {
+    remote_proc {
+        servers => [
+            {
+                host => "domain.com"
+                port => 22
+                username => "fenicks"
+                server_tags => "traefik, ha-proxy, nginx"
+            }
+        ]
+    }
+}
+```
+
+```javascript
+input {
+    remote_proc {
+        servers => [
+            {
+                host => "domain.com"
+                port => 22
+                username => "fenicks"
+                server_tags => "rethinkdb"
+            }
+        ]
+    }
+}
+```

data/lib/logstash/inputs/remote_proc.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'logstash/inputs/base'
 require 'logstash/namespace'
 require 'socket' # for Socket.gethostname
@@ -80,7 +79,8 @@ module LogStash
         'gateway_password' => nil, # :string
         'gateway_ssh_private_key' => nil, # :string
         'system_reader' => 'cat', # :string
-        'proc_prefix_path' => '/proc' # :string
+        'proc_prefix_path' => '/proc', # :string
+        'server_tags' => nil # :string (comma separated list)
       }.freeze
 
       # Liste of commands for each `/proc` endpoints.
@@ -154,6 +154,7 @@ module LogStash
                 chan.exec(command) do |ch, success|
                   ch[:result_host] = ssh.properties['host']
                   ch[:result_port] = ssh.properties['port']
+                  ch[:result_server_tags] = ssh.properties['server_tags']
                   unless success
                     @logger.warn('CHANNEL_EXEC_UNSUCCESS',
                                  command: command,
@@ -184,7 +185,8 @@ module LogStash
                       remote_host: ch[:result_host],
                       remote_port: ch[:result_port],
                       command: command,
-                      message: ch[:result_data]
+                      message: ch[:result_data],
+                      server_tags: ch[:result_server_tags]
                     )
                     decorate(event)
                     queue << event

data/logstash-input-remote_proc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-remote_proc'
-  s.version = '0.7.0'
+  s.version = '0.8.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'
@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
                 'vendor/**/*',
                 '*.gemspec',
                 '*.md',
-                'CONTRIBUTORS',
                 'Gemfile',
                 'LICENSE',
                 'NOTICE.TXT']
@@ -26,10 +25,10 @@ Gem::Specification.new do |s|
   s.metadata = { 'logstash_plugin' => 'true', 'logstash_group' => 'input' }
 
   # Gem dependencies
-  s.add_runtime_dependency 'logstash-core'
+  s.add_runtime_dependency 'logstash-core-plugin-api', '>= 1.60', '<= 2.99'
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'net-ssh', '~> 2.9', '>= 2.9.2'
   s.add_runtime_dependency 'net-ssh-gateway', '~> 1.2', '>= 1.2.0'
-  s.add_runtime_dependency 'stud'
-  s.add_development_dependency 'logstash-devutils'
+  s.add_runtime_dependency 'stud', '>= 0.0.22'
+  s.add_development_dependency 'logstash-devutils', '~> 1.3', '>= 1.3.1'
 end

data/spec/inputs/remote_proc_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'logstash/devutils/rspec/spec_helper'
 require 'logstash/inputs/remote_proc'
 require 'net/ssh'
@@ -43,7 +42,7 @@ describe LogStash::Inputs::RemoteProc do
     it '.register' do
       ssh_gateway = spy('Net::SSH::Gateway')
       expect(Net::SSH::Gateway).to receive(:new).with(any_args)
-        .and_return(ssh_gateway)
+                                                .and_return(ssh_gateway)
       rp_gateway = described_class.new(
         'servers' => [{ 'host' => 'localhost',
                         'port' => 22,

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-remote_proc
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Christian Kakesa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-10 00:00:00.000000000 Z
+date: 2017-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  name: logstash-core
+        version: '1.60'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '2.99'
+  name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.60'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -83,7 +89,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.22
   name: stud
   prerelease: false
   type: :runtime
@@ -91,21 +97,27 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.22
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.1
   name: logstash-devutils
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.1
 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
 email: christian@kakesa.net
 executables: []
@@ -113,7 +125,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- CONTRIBUTORS
+- CONTRIBUTORS.md
 - Gemfile
 - LICENSE
 - NOTICE.TXT
@@ -504,7 +516,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key:
 specification_version: 4
 summary: This Logstash plugin collects PROCFS metrics through remote SSH servers.