nrpeclient 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bf342399b7f18cdf95912c502e253f62428273d
-  data.tar.gz: 3cac60d09567b155bc4fc27ce0e12560bd6dce57
+  metadata.gz: 4ac5e364e88a7a516d11323164c1c513d6e6e397
+  data.tar.gz: c592626cd73ef80216d74950fe2f3046533ac7ad
 SHA512:
-  metadata.gz: 097e932e95dd3f46c633dac68f8e652b27c037490e77f242282bbdbe83feb40eafa82aa5755faf70b6d49f85e35a28b56f161aae68b2f255e72b3740ff7b2d8c
-  data.tar.gz: 7ede0153f0b48c01076fc421bf880425a72d2d7a90efbf3b305eed1af387e9833c30e0d8c94ea33f8bf7d3c0e7dc635ec904baa97a0f4f55dea3b2a824925785
+  metadata.gz: d5aff014899de7617e962188ca2a968a750d40a854c3b5b1ef1b4451e2a8c6bbf1625ca5ef3eda986baadbdcbc1fa0cac4a96454fc7388a07932989d9568d86b
+  data.tar.gz: 14e17897727f48bfc6d8a024fcdc7a70676b247073a133de6d4a32653ba9c6f76f70e64948921183f1359aff30b2a6166934750fa7c810ccf8e4cc95682439cc

data/lib/nrpeclient/check_nrpe.rb

@@ -13,12 +13,10 @@ module Nrpeclient
     def initialize(options={})
       @options = DEFAULT_OPTIONS.merge(options)
       if @options[:ssl]
-        @ssl = {}
-        @ssl.context = OpenSSL::SSL::SSLContext.new :SSLv23
-        @ssl.context.ciphers = 'ADH'
-        @ssl.context.cert = OpenSSL::X509::Certificate.new(File.open("certificate.crt"))
-        @ssl.context.key = OpenSSL::PKey::RSA.new(File.open("certificate.key"))
-        @ssl.context.version = :SSLv23
+        @ssl_context = OpenSSL::SSL::SSLContext.new :SSLv23
+        @ssl_context.ciphers = 'ADH'
+        @ssl_context.cert = OpenSSL::X509::Certificate.new(File.open(@options.fetch(:ssl_cert))) if !@options[:ssl_cert].nil?
+        @ssl_context.key = OpenSSL::PKey::RSA.new(File.open(@options.fetch(:ssl_key))) if !@options[:ssl_key].nil?
       end
     end
 
@@ -30,13 +28,13 @@ module Nrpeclient
       begin
         socket = TCPSocket.open(@options[:host], @options[:port])
         if @options[:ssl]
-          socket = OpenSSL::SSL::SSLSocket.new(socket, @ssl.context)
+          socket = OpenSSL::SSL::SSLSocket.new(socket, @ssl_context)
           socket.sync_close = true
           socket.connect
         end
 
         socket.write(query.to_bytes)
-        response = Nrpeclient::NrpePacket.read(socket)
+        response = Nrpeclient::NrpePacket.read(socket, !@options[:ssl])
         socket.close
         return response
       rescue Errno::ETIMEDOUT

data/lib/nrpeclient/nrpe_packet.rb

@@ -13,7 +13,7 @@ module Nrpeclient
 
     MAX_PACKET_SIZE = 12 + 1024
 
-    attr_accessor :packet_version, :crc32, :result_code, :buffer
+    attr_accessor :packet_version, :crc32, :result_code, :buffer, :perfdata
 
     def initialize(unpacked=nil)
       @packet_version = NRPE_PACKET_VERSION_2
@@ -26,6 +26,15 @@ module Nrpeclient
         @result_code    = unpacked[3]
         @buffer         = unpacked[4]
         @random         = unpacked[5]
+        # Parse perfdata and return as a hash
+        if @buffer.include? "|" then
+          @perfdata = Hash.new
+          @buffer.split("|")[1].split(",").each do |metric|
+            key = metric.split("=")[0].strip
+            value = metric.split("=")[1].strip
+            @perfdata[:"#{key}"] = value
+          end
+        end
       end
     end
 
@@ -61,11 +70,11 @@ module Nrpeclient
       [ @packet_version, @packet_type, use_crc32, @result_code, @buffer, @random].pack("nnNna#{MAX_PACKETBUFFER_LENGTH}n")
     end
 
-    def self.read(io)
+    def self.read(io, validate_crc32=true)
       bytes = io.read(MAX_PACKET_SIZE)
       values = bytes.unpack("nnNnA#{MAX_PACKETBUFFER_LENGTH}n")
       packet = self.new(values)
-      packet.validate_crc32
+      packet.validate_crc32 if validate_crc32
       packet
     end
   end

data/lib/nrpeclient/version.rb

@@ -1,3 +1,3 @@
 module Nrpeclient
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: nrpeclient
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Arun Scaria
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Executed the command passed at the remote machine where NRPE daemon is
@@ -75,17 +75,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby version of check_nrpe command from Nagios core