zabbix-ruby-client 0.0.19 → 0.0.20

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Zabbbix Ruby Client Changelog
 -----------------------------
 
+### v0.0.20 - 2013-12-25
+
+* fix network plugin
+* fix new return code handling from zabbix_sender 2.2.x
+* more debugging info when loglevel: debug
+
 ### v0.0.19 - 2013-12-24
 
 * fix on logger when zabbix-sender command fails

data/lib/zabbix-ruby-client/plugins/network.rb

@@ -14,14 +14,14 @@ module ZabbixRubyClient
         if info
           time = Time.now.to_i
           back = []
-          back << "#{host} net.rx_ok[#{interface}] #{time} #{info[2]}"
-          back << "#{host} net.rx_packets[#{interface}] #{time} #{info[3]}"
-          back << "#{host} net.rx_err[#{interface}] #{time} #{info[4]}"
-          back << "#{host} net.rx_drop[#{interface}] #{time} #{info[5]}"
-          back << "#{host} net.tx_ok[#{interface}] #{time} #{info[10]}"
-          back << "#{host} net.tx_packets[#{interface}] #{time} #{info[11]}"
-          back << "#{host} net.tx_err[#{interface}] #{time} #{info[12]}"
-          back << "#{host} net.tx_drop[#{interface}] #{time} #{info[13]}"
+          back << "#{host} net.rx_ok[#{interface}] #{time} #{info[1]}"
+          back << "#{host} net.rx_packets[#{interface}] #{time} #{info[2]}"
+          back << "#{host} net.rx_err[#{interface}] #{time} #{info[3]}"
+          back << "#{host} net.rx_drop[#{interface}] #{time} #{info[4]}"
+          back << "#{host} net.tx_ok[#{interface}] #{time} #{info[9]}"
+          back << "#{host} net.tx_packets[#{interface}] #{time} #{info[10]}"
+          back << "#{host} net.tx_err[#{interface}] #{time} #{info[11]}"
+          back << "#{host} net.tx_drop[#{interface}] #{time} #{info[12]}"
           return back
         else
           return []
@@ -43,7 +43,7 @@ module ZabbixRubyClient
           false
         end
       end
-      
+
     end
   end
 end

data/lib/zabbix-ruby-client/runner.rb

@@ -21,8 +21,10 @@ module ZabbixRubyClient
       @data = ZabbixRubyClient::Data.new(@config['host'])
       @logsdir = makedir(@config['logsdir'], 'logs')
       ZabbixRubyClient::Plugins.scan_dirs([ PLUGINDIR ] + @config['plugindirs'])
-      ZabbixRubyClient::Log.set_logger(File.join(@logsdir, 'zrc.log'), 'info')
+      ZabbixRubyClient::Log.set_logger(File.join(@logsdir, 'zrc.log'), @config['loglevel'])
       ZabbixRubyClient::Log.debug @config.inspect
+      zabbix_sender_version = `zabbix_sender -V | head -1`.split(/\s/)[2]
+      @is_22 = /v2\.2\./.match zabbix_sender_version
     end
 
     def collect
@@ -39,14 +41,37 @@ module ZabbixRubyClient
 
     def upload
       file = @store.record(@data.merge)
+      command = "#{@config['zabbix']['sender']} -z #{@config['zabbix']['host']} -p #{@config['zabbix']['port']} -T -i #{file}"
+      ZabbixRubyClient::Log.debug command
       begin
-        res = `#{@config['zabbix']['sender']} -z #{@config['zabbix']['host']} -p #{@config['zabbix']['port']} -T -i #{file}`
-        if $?.to_i != 0
-          @store.keepdata(file)
+        res = `#{command}`
+        if @is_22
+          case $?.to_i
+          when 0
+            ZabbixRubyClient::Log.debug "zabbix-sender: Data Sent"
+          when 1
+            @store.keepdata(file)
+            ZabbixRubyClient::Log.error "zabbix-sender: Sending failed"
+            ZabbixRubyClient::Log.error res
+          when 512
+            ZabbixRubyClient::Log.warn "zabbix-sender: Some values failed"
+            ZabbixRubyClient::Log.warn res
+          else
+            ZabbixRubyClient::Log.error "zabbix-sender: Something failed. #{$i}. code #{$?.to_i} was returned"
+            ZabbixRubyClient::Log.error res
+          end
+        else
+          if $?.to_i != 0
+            @store.keepdata(file)
+            ZabbixRubyClient::Log.error "zabbix-sender: Sending failed"
+            ZabbixRubyClient::Log.error res
+          else
+            ZabbixRubyClient::Log.debug "zabbix-sender: Data Sent"
+          end
         end
       rescue Exception => e
         @store.keepdata(file)
-        ZabbixRubyClient::Log.error "Sending failed."
+        ZabbixRubyClient::Log.error "zabbix-sender: broken."
         ZabbixRubyClient::Log.error e.message
       end
     end

data/lib/zabbix-ruby-client/version.rb

@@ -1,3 +1,3 @@
 module ZabbixRubyClient
-  VERSION ||= "0.0.19"
+  VERSION ||= "0.0.20"
 end

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: zabbix-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
+  prerelease: 
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2013-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,57 +46,65 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A zabbix alternative to zabbix-agent using zabbix-sender.
@@ -193,26 +206,33 @@ files:
 homepage: https://github.com/eduvo/zabbix-ruby-client
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2258474499150129505
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2258474499150129505
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: This tool is intended to use zabbix sender to propagate monitoring data for
   Zabbix server.
 test_files:

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 93d282dcf0d5f02de0b8cf3ba0dd16c5a90d0950
-  data.tar.gz: 6318e9b04b8eb7fb601ba2311d0b02f504606889
-SHA512:
-  metadata.gz: 4492448212c466a3a7b655a01333a7b6869f8ec3ef4f000c5a9a25f13a465ce893990200cce6a74256de6be52d81b09f408bcadd50e5e1acf620a962dad3ca44
-  data.tar.gz: 810b5853b3ec99b09a1f203b79645414e225f753a62300aad5b5633cfc9865d1bbba80cc076e1adf74ceab10282c97f267bd07d7fae422366b037ec46e3b1ada