zabbix-ruby-client 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6ca5d569fa5a14fcd429f4a4715dbf40dd59c0a
-  data.tar.gz: e923105d8540ebea6479448c03d434c6075fa7b7
+  metadata.gz: ae11e177a0af9d4fd221a5307c23d1eb5814970e
+  data.tar.gz: 1a00c8fe85a8bf88c1365e81b24665c7a89fcf0e
 SHA512:
-  metadata.gz: f596cc9dee5ab9ccf630e82c77b7644dc247bea00a42ed3db8d0b680fba98dd01b573cda616a3217d444770ef31d462a8567bd22fe41576663cdab4f98f10698
-  data.tar.gz: 4849799d77077d96ff27385ceaaa1fd867106c7786f4057e5ac989af09945b97af881aeee74f1ddd1d13c0320b28bdff53fbf492985ce83693abf0da4ac61fd4
+  metadata.gz: 577d25f30dde3a56348b3e4dd5f14afbdd44d45d96f3ce600f583d5033c58b6b5382403ae62988f9b5493fbd07ac648e97fb549111a1dd1af874daee90b0c497
+  data.tar.gz: 929b686a26cfd82ea258c36dbeeaada49369d93d041a9617bc92526f8f4d1dcf61dd3a21193c2b8e76a057d66e21d3be57c64e3a8f7bdc67eca4396b05ce6c38

data/.gitignore

@@ -11,6 +11,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+Gemfile.lock
 .settings
 vendor/ruby
 zrc-*

data/.ruby-version

@@ -1 +1 @@
-2.1
+2.3

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 cache: bundler
+sudo: false
 rvm:
   - 1.9.3
-  - 2.1.1
+  - 2.3.0

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Zabbbix Ruby Client Changelog
 -----------------------------
 
+### v0.1.3 - 2016-07-06
+- update dependencies
+- prepare an OS detection system for plugins (to support FreeBSD)
+- fix a compatibility issue with zabbix sender 3.x
+- experimental support for FreeBSD
+
 ### v0.1.2 - 2015-01-26
 - compat with zabbix_sender 2.4 (temporary fix, requires more investigation)
 - fix cpu and apache zabbix templates for zabbix 2.4

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in zabbix-ruby-client.gemspec
 gemspec
+
+group :test do
+  gem 'rake'
+end

data/README.md

@@ -12,7 +12,7 @@ Zabbix Ruby Client
 
 This tool is designed to make easy to install zabbix reporter on monitored servers using zabbix-sender rather than zabbix-agent. It targets on monitoring mainly linux servers and is built on a plugin system so that you can decide what is going to be reported.
 
-The development is still in progress but it produces results and works in production for Faria since fall 2013. Use at your own risk and read the code first. It works with ruby 1.9.3 to 2.1.2.
+The development is still in progress but it produces results and works in production for Faria since fall 2013. Use at your own risk and read the code first. It works with ruby 1.9.3 to 2.3.
 
 Check the [Changelog](CHANGELOG.md) for recent changes.
 
@@ -86,29 +86,29 @@ Here is an example setup using the files generated by the init:
 
 There are a set of standart plugins included in the package, aimed at linux systems.
 
-* **debian/ubuntu** system stats ([system_tpl](master/zabbix-templates/system_tpl.xml) includes the following)
-  * **load** (uses /proc/loadavg) [load_tpl](master/zabbix-templates/load_tpl.xml)
-  * **cpu** (uses /proc/stat) [cpu_tpl](master/zabbix-templates/cpu_tpl.xml)
-  * **memory** (uses /proc/meminfo) [memory_tpl](master/zabbix-templates/memory_tpl.xml)
-  * **disk** (uses /proc/diskstats) [disk_tpl](master/zabbix-templates/disk_tpl.xml)
-    * args [ "md-0", "/", "vgebs" ] = group identifier, mountpoint, groupname where identifier is what is found in /proc/diskstats, and groupname is something found in df command. The mount point will be used as label.
-  * **network** (uses /proc/net/dev) [network_tpl](master/zabbix-templates/network_tpl.xml)
+* **debian/ubuntu** system stats ([system_tpl](zabbix-templates/system_tpl.xml) includes the following)
+  * **load** (uses /proc/loadavg) [load_tpl](zabbix-templates/load_tpl.xml)
+  * **cpu** (uses /proc/stat or iostat -c) [cpu_tpl](zabbix-templates/cpu_tpl.xml)
+  * **memory** (uses /proc/meminfo) [memory_tpl](zabbix-templates/memory_tpl.xml)
+  * **disk** (uses /proc/diskstats) [disk_tpl](zabbix-templates/disk_tpl.xml)
+    * args [ "md-0", "/", "vgebs" ] = group identifier, mountpoint, groupname where identifier is what is found in /proc/diskstats (or iostat for FreeBSD), and groupname is something found in df command. The mount point will be used as label.
+  * **network** (uses /proc/net/dev) [network_tpl](zabbix-templates/network_tpl.xml)
     * args [ eth0 ] is just the interface identifier
   * **apt** (uses ubuntu /usr/lib/update-notifier/apt-check) this one will populate the 'tag' field in host info, and is supposed to run every few hours or at least not every minute [apt_tpl](master/zabbix-templates/apt_tpl.xml)
     * for debian, `apt-get install update-notifier-common`
   * **sysinfo** (uses uname -a) is populating the host info in the inventory, and should be ran at setup and/or monthly [sysinfo_tpl](master/zabbix-templates/sysinfo_tpl.xml)
-* **apache** (depends on mod_status with status_extended on) [apache_tpl](master/zabbix-templates/apache_tpl.xml)
-* **mysql** (uses mysqladmin extended-status) [mysql_tpl](master/zabbix-templates/mysql_tpl.xml)
+* **apache** (depends on mod_status with status_extended on) [apache_tpl](zabbix-templates/apache_tpl.xml)
+* **mysql** (uses mysqladmin extended-status) [mysql_tpl](zabbix-templates/mysql_tpl.xml)
 * **postgres** (uses psql and pg_stat_database) [postgres_tpl](master/zabbix-templates/postgres_tpl.xml)
   * best is to use a .pgpass file see http://www.postgresql.org/docs/9.0/interactive/libpq-pgpass.html
-* **nginx** (requires httpStubStatus nginx module) [nginx_tpl](master/zabbix-templates/nginx_tpl.xml)
-* **redis** (uses redis-cli info) [redis_tpl](master/zabbix-templates/redis_tpl.xml)
+* **nginx** (requires httpStubStatus nginx module) [nginx_tpl](zabbix-templates/nginx_tpl.xml)
+* **redis** (uses redis-cli info) [redis_tpl](zabbix-templates/redis_tpl.xml)
   * args [ "/path/to/redis-cli", "options to connect" ]
-* **openvpn** (uses /etc/openvpn/openvpn-status.log) [openvpn_tpl](master/zabbix-templates/openvpn_tpl.xml)
+* **openvpn** (uses /etc/openvpn/openvpn-status.log) [openvpn_tpl](zabbix-templates/openvpn_tpl.xml)
   * args [ "/etc/openvpn/openvpn-status.log" ]
-* **cisco** (type ASA 5510) [cisco_tpl](master/zabbix-templates/cisco_tpl.xml)
+* **cisco** (type ASA 5510) [cisco_tpl](zabbix-templates/cisco_tpl.xml)
   * uses a snmp setup
-* **RabbitMQ** (uses [rabbitmqadmin](http://www.rabbitmq.com/management-cli.html)) [rabbitmq_tpl](master/zabbix-templates/rabbitmq_tpl.xml)
+* **RabbitMQ** (uses [rabbitmqadmin](http://www.rabbitmq.com/management-cli.html)) [rabbitmq_tpl](zabbix-templates/rabbitmq_tpl.xml)
   * args [ "/path/to/rabbitmqadmin", "login", "password" ]
 * **mysqlcommand** (uses arbitrary mysql commands to create custom items)
   * args [ "app_name", "dbname", "command_args", "command1_name", "command1_sql", "command2_name", "command2_sql" ]
@@ -192,7 +192,11 @@ After launching manual tunnels and ensuring their survival with monit I tried `a
 I first created on both sides an autossh user with no console and no password:
 
 ```
+# on a linux system
 sudo useradd -m -r -s /bin/false -d /usr/local/zabtunnel zabtunnel
+
+# or fopr FreeBSD
+sudo pw adduser zabtunnel -g guest -d /usr/local/zabtunnel -s /nonexistent -c "Zabbix Tunnel user"
 ```
 
 On the zabbix server I created a key that I transfered to the clients in `/usr/local/zabtunnel/.ssh/authorized_keys`

data/bin/zrc

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require "zabbix-ruby-client/version"
 require "zabbix-ruby-client/cli"
 
 ZabbixRubyClient::Cli.start

data/lib/zabbix-ruby-client.rb

@@ -1,6 +1,6 @@
-require "zabbix-ruby-client/version"
 require "zabbix-ruby-client/logger"
 require "zabbix-ruby-client/plugins"
+require "zabbix-ruby-client/plugin_base"
 require "zabbix-ruby-client/store"
 require "zabbix-ruby-client/data"
 require "zabbix-ruby-client/runner"

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

@@ -1,3 +1,4 @@
+require 'rbconfig'
 require "zabbix-ruby-client/logger"
 
 module ZabbixRubyClient
@@ -10,6 +11,28 @@ module ZabbixRubyClient
     def perform(command)
     end
 
+    def time
+      @_now ||= Time.now.to_i
+    end
+
+    def os
+      @_os ||= (
+        host_os = RbConfig::CONFIG['host_os']
+        case host_os
+        when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+          :windows
+        when /darwin|mac os/
+          :macosx
+        when /linux/
+          :linux
+        when /solaris|bsd/
+          :unix
+        else
+          raise Error::WebDriverError, "unknown os: #{host_os.inspect}"
+        end
+      )
+    end
+
     def getline(file, pattern=false)
       if File.readable? file
         File.open(file,'r') do |f|

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

@@ -4,6 +4,7 @@ module ZabbixRubyClient
   module Plugins
     module Apache
       extend self
+      extend ZabbixRubyClient::PluginBase
 
       def collect(*args)
         host = args[0]
@@ -11,7 +12,6 @@ module ZabbixRubyClient
         ret['Score'] = get_scores(ret["Scoreboard"])
         ret.delete "Scoreboard"
 
-        time = Time.now.to_i
         back = []
         back << "#{host} apache[TotalAccesses] #{time} #{ret["Total Accesses"]}"
         back << "#{host} apache[TotalKBytes] #{time} #{ret["Total kBytes"]}"

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

@@ -4,12 +4,12 @@ module ZabbixRubyClient
   module Plugins
     module Apt
       extend self
+      extend ZabbixRubyClient::PluginBase
 
       def collect(*args)
         host = args[0]
         info = get_info
         if info
-          time = Time.now.to_i
           back = []
           back << "#{host} apt[security] #{time} #{info[0]}"
           back << "#{host} apt[pending] #{time} #{info[1]}"
@@ -23,12 +23,14 @@ module ZabbixRubyClient
     private
 
       def get_info
-        info = aptinfo
-        if info
-          back = info.split(/;/).map(&:to_i)
-          back
-        else
-          false
+        if os == :linux
+          info = aptinfo
+          if info
+            back = info.split(/;/).map(&:to_i)
+            back
+          else
+            false
+          end
         end
       end
 

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

@@ -14,7 +14,6 @@ module ZabbixRubyClient
         info = get_info
         back = []
         if info
-          time = Time.now.to_i
           info.each do |k,v|
             back << "#{host} cpu[#{k}] #{time} #{v}"
           end
@@ -26,22 +25,58 @@ module ZabbixRubyClient
 
       def get_info
         ret = {}
-        info = getline("/proc/stat", "^cpu ")
-        if info
-          back = info.split(/\s+/).map(&:to_i)
-          ret["user"] = back[1]
-          ret["nice"] = back[2]
-          ret["system"] = back[3]
-          ret["idle"] = back[4]
-          ret["iowait"] = back[5]
-          ret["irq"] = back[6]
-          ret["soft"] = back[7]
-          ret["steal"] = back[8] || 0
-          ret["guest"] = back[9] || 0
-          ret["used"] = back[1...4].reduce(&:+)
-          ret["total"] = back[1...9].reduce(&:+)
-          ret
+        case os
+        when :linux
+          info = getline("/proc/stat", "^cpu ")
+          if info
+            back = info.split(/\s+/).map(&:to_i)
+            ret["user"] = back[1]
+            ret["nice"] = back[2]
+            ret["system"] = back[3]
+            ret["idle"] = back[4]
+            ret["iowait"] = back[5]
+            ret["irq"] = back[6]
+            ret["soft"] = back[7]
+            ret["steal"] = back[8] || 0
+            ret["guest"] = back[9] || 0
+            ret["used"] = back[1...4].reduce(&:+)
+            ret["total"] = back[1...9].reduce(&:+)
+            ret
+          else
+            false
+          end
+        when :unix
+          info = iostat
+          if info
+            back = info.split(/\s+/).map(&:to_i)
+            ret["user"] = back[12]
+            ret["nice"] = back[13]
+            ret["system"] = back[14]
+            ret["idle"] = back[16]
+            ret["iowait"] = back[15]
+            ret["irq"] = 0
+            ret["soft"] = 0
+            ret["steal"] = 0
+            ret["guest"] = 0
+            ret["used"] = back[12..14].reduce(&:+)
+            ret["total"] = back[12..16].reduce(&:+)
+            ret
+          else
+            false
+          end
+        else
+          false
+        end
+      end
+
+      def iostat
+        output = `/usr/sbin/iostat -C | tail -n 1`
+        if $?.to_i == 0
+          Log.debug self
+          Log.debug output
+          output
         else
+          Log.warn "Oh there is no command."
           false
         end
       end

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

@@ -17,7 +17,6 @@ module ZabbixRubyClient
 
         info = get_info(dev, mapped)
         if info
-          time = Time.now.to_i
           back = []
           back << "#{host} disk.space[#{mapped},size] #{time} #{to_m(info[1])}"
           back << "#{host} disk.space[#{mapped},used] #{time} #{to_m(info[2])}"
@@ -56,9 +55,30 @@ module ZabbixRubyClient
         info = diskinfo(device)
         if info
           back = info.split(/\s+/)
-          io = getline("/proc/diskstats", " #{disk} ")
-          if io
-            back += io.split(/\s+/)
+          case os
+          when :linux
+            io = getline("/proc/diskstats", " #{disk} ")
+            if io
+              back += io.split(/\s+/)
+            end
+          when :unix
+            output = `iostat -x | grep "#{disk}"`
+            data = output.split(/\s+/)
+            back << 0 # --
+            back << 0 # --
+            back << 0 # --
+            back << data[3] # read_ok
+            back << 0 # read_merged
+            back << 0 # read_sector
+            back << 0 # read_time
+            back << data[4] # write_ok
+            back << 0 # write_merged
+            back << 0 # write_sector
+            back << 0 # write_time
+            back << 0 # io_time
+            back << 0 # io_merged
+          else
+            return false
           end
           back
         else
@@ -67,7 +87,7 @@ module ZabbixRubyClient
       end
 
       def diskinfo(disk)
-        output = `df | grep "#{disk}"`
+        output = `df -k | grep "#{disk}"`
         if $?.to_i == 0
           Log.debug self
           Log.debug output

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

@@ -1,4 +1,4 @@
-# for more info check 
+# for more info check
 # http://juliano.info/en/Blog:Memory_Leak/Understanding_the_Linux_load_average
 require "zabbix-ruby-client/plugin_base"
 
@@ -12,7 +12,6 @@ module ZabbixRubyClient
         host = args[0]
         info = get_info
         if info
-          time = Time.now.to_i
           back = []
           back << "#{host} load[one] #{time} #{info[0]}"
           back << "#{host} load[five] #{time} #{info[1]}"
@@ -27,10 +26,22 @@ module ZabbixRubyClient
     private
 
       def get_info
-        info = getline("/proc/loadavg")
-        if info
-          back = info.split(/\s+/)
-          back[3] = back[3].split(/\//)[0]
+        case os
+        when :linux
+          info = getline("/proc/loadavg")
+          if info
+            back = info.split(/\s+/)
+            back[3] = back[3].split(/\//)[0]
+            back
+          else
+            false
+          end
+        when :unix
+          output = `uptime | awk '{print $(NF-2)" "$(NF-1)" "$(NF-0)}' | tr "," " "`
+          back = output.split(/\s+/)
+          procs = `top -n | grep processes`
+          data = procs.split(/\s+/)
+          back << data[2]
           back
         else
           false

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

@@ -11,7 +11,6 @@ module ZabbixRubyClient
         host = args[0]
         info = get_info
         if info
-          time = Time.now.to_i
           back = []
           back << "#{host} memory[total] #{time} #{info['MemTotal']}"
           back << "#{host} memory[free] #{time} #{info['MemFree']}"
@@ -30,16 +29,39 @@ module ZabbixRubyClient
     private
 
       def get_info
-        info = meminfo
-        if info
-          back = splitinfo(info)
-          back["MemTotal"] = back["MemTotal"] * 1024
-          back["MemFree"] = (back['MemFree'] + back['Buffers'] + back['Cached']) * 1024
-          back["MemUsed"] = back["MemTotal"] - back["MemFree"]
-          back["MemPercent"] = (back["MemUsed"] / back["MemTotal"].to_f * 100).to_i
-          back['SwapTotal'] = back['SwapTotal'] * 1024
-          back['SwapFree'] = back['SwapFree'] * 1024
-          back['SwapUsed'] = back['SwapTotal'] - back['SwapFree']
+        case os
+        when :linux
+          info = meminfo
+          if info
+            back = splitinfo(info)
+            back["MemTotal"] = back["MemTotal"] * 1024
+            back["MemFree"] = (back['MemFree'] + back['Buffers'] + back['Cached']) * 1024
+            back["MemUsed"] = back["MemTotal"] - back["MemFree"]
+            back["MemPercent"] = (back["MemUsed"] / back["MemTotal"].to_f * 100).to_i
+            back['SwapTotal'] = back['SwapTotal'] * 1024
+            back['SwapFree'] = back['SwapFree'] * 1024
+            back['SwapUsed'] = back['SwapTotal'] - back['SwapFree']
+            back['SwapPercent'] = 0
+            unless back['SwapTotal'] == 0
+              back['SwapPercent'] = (back['SwapUsed'] / back['SwapTotal'].to_f * 100).to_i
+            end
+            back
+          else
+            false
+          end
+        when :unix
+          memtotal = `sysctl hw.realmem | cut -d' ' -f2`.chop
+          memused = `sysctl hw.usermem | cut -d' ' -f2`.chop
+          swap = `swapinfo -k | tail -n 1`
+          _, _, swapused, swaptotal = *swap.split(/\s+/)
+          back = {}
+          back["MemTotal"] = memtotal
+          back["MemFree"] = memtotal.to_i - memused.to_i
+          back["MemUsed"] = memused
+          back["MemPercent"] = (memused.to_i / memtotal.to_f * 100).to_i
+          back['SwapTotal'] = swaptotal.to_i * 1024
+          back['SwapUsed'] = swapused.to_i * 1024
+          back['SwapFree'] = back['SwapTotal']  - back['SwapUsed'] 
           back['SwapPercent'] = 0
           unless back['SwapTotal'] == 0
             back['SwapPercent'] = (back['SwapUsed'] / back['SwapTotal'].to_f * 100).to_i

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

@@ -4,6 +4,7 @@ module ZabbixRubyClient
   module Plugins
     module Mysql
       extend self
+      extend ZabbixRubyClient::PluginBase
 
       def collect(*args)
         host = args[0]
@@ -16,7 +17,6 @@ module ZabbixRubyClient
           return []
         end
 
-        time = Time.now.to_i
         back = []
         back << "#{host} mysql.status[Aborted_clients] #{time} #{status["Aborted_clients"]}"
         back << "#{host} mysql.status[Aborted_connects] #{time} #{status["Aborted_connects"]}"

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

@@ -4,6 +4,7 @@ module ZabbixRubyClient
   module Plugins
     module Mysqlcommand
       extend self
+      extend ZabbixRubyClient::PluginBase
 
       def collect(*args)
         host = args.shift
@@ -13,7 +14,6 @@ module ZabbixRubyClient
         mysqlcommand = "mysql #{mysqlargs} -s --skip-column-names -e \"%s\" #{mysqldb}"
         back = []
         Hash[*args].each do |name, command|
-          time = Time.now.to_i
           comm = sprintf(mysqlcommand, command.gsub(/"/,'\"'))
           res = `#{comm}`
           if $?.to_i == 0

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

@@ -12,16 +12,15 @@ module ZabbixRubyClient
         interface = args[1]
         info = get_info(interface)
         if info
-          time = Time.now.to_i
           back = []
-          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]}"
+          back << "#{host} net.rx_ok[#{interface}] #{time} #{info[:rx_ok]}"
+          back << "#{host} net.rx_packets[#{interface}] #{time} #{info[:rx_packets]}"
+          back << "#{host} net.rx_err[#{interface}] #{time} #{info[:rx_err]}"
+          back << "#{host} net.rx_drop[#{interface}] #{time} #{info[:rx_drop]}"
+          back << "#{host} net.tx_ok[#{interface}] #{time} #{info[:tx_ok]}"
+          back << "#{host} net.tx_packets[#{interface}] #{time} #{info[:tx_packets]}"
+          back << "#{host} net.tx_err[#{interface}] #{time} #{info[:tx_err]}"
+          back << "#{host} net.tx_drop[#{interface}] #{time} #{info[:tx_drop]}"
           return back
         else
           return []
@@ -36,9 +35,40 @@ module ZabbixRubyClient
     private
 
       def get_info(interface)
-        info = getline("/proc/net/dev", "#{interface}:")
-        if info
-          info.split(/\s+/)
+        back = {}
+        case os
+        when :linux
+          data = getline("/proc/net/dev", "#{interface}:")
+          if data
+            info = data.split(/\s+/)
+            back[:rx_ok] = info[1]
+            back[:rx_packets] = info[2]
+            back[:rx_err] = info[3]
+            back[:rx_drop] = info[4]
+            back[:tx_ok] = info[9]
+            back[:tx_packets] = info[10]
+            back[:tx_err] = info[11]
+            back[:tx_drop] = info[12]
+            return back
+          else
+            false
+          end
+        when :unix
+          data = `/usr/bin/netstat -i -b -n -I #{interface} | head -n 2 | tail -n 1`
+          if data
+            info = data.split(/\s+/)
+            back[:rx_ok] = info[7]
+            back[:rx_packets] = info[4]
+            back[:rx_err] = info[5].gsub(/-/, "0")
+            back[:rx_drop] = info[6].gsub(/-/, "0")
+            back[:tx_ok] = info[10]
+            back[:tx_packets] = info[8]
+            back[:tx_err] = info[9].gsub(/-/, "0")
+            back[:tx_drop] = info[11].gsub(/-/, "0")
+            return back
+          else
+            false
+          end
         else
           false
         end

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

@@ -11,7 +11,6 @@ module ZabbixRubyClient
         host = args[0]
         info = get_status
 
-        time = Time.now.to_i
         back = []
         back << "#{host} nginx[total] #{time} #{info[:total]}"
         back << "#{host} nginx[reading] #{time} #{info[:reading]}"

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

@@ -14,7 +14,6 @@ module ZabbixRubyClient
         info = get_info(ovpnfile)
         back = []
         if info
-          time = Time.now.to_i
           back << "#{host} ovpn[received] #{time} #{info['received']}"
           back << "#{host} ovpn[sent] #{time} #{info['sent']}"
           back << "#{host} ovpn[count] #{time} #{info['count']}"

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

@@ -4,6 +4,7 @@ module ZabbixRubyClient
   module Plugins
     module Postgres
       extend self
+      extend ZabbixRubyClient::PluginBase
 
       def collect(*args)
         host = args[0]
@@ -35,7 +36,6 @@ module ZabbixRubyClient
           return []
         end
 
-        time = Time.now.to_i
         back = []
         status.each do |e,v|
           back << "#{host} postgres.#{e}[#{dbname}] #{time} #{v}"

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

@@ -10,14 +10,10 @@ module ZabbixRubyClient
       extend ZabbixRubyClient::PluginBase
 
       def collect(*args)
-        host = args[0]
-        rabbitmqadmin = args[1]
-        login = args[2]
-        pass = args[3]
+        host, rabbitmqadmin, login, pass = *args
         info = get_info(rabbitmqadmin, login, pass)
         back = []
         if info
-          time = Time.now.to_i
           back << "#{host} rabbitmq.version #{time} #{info['rabbitmq_version']}"
           back << "#{host} rabbitmq.erlang.version #{time} #{info['erlang_version']}"
           %w(ack deliver deliver_get publish redeliver).each do |i|

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

@@ -5,6 +5,7 @@ module ZabbixRubyClient
   module Plugins
     module Redis
       extend self
+      extend ZabbixRubyClient::PluginBase
 
       def collect(*args)
         host = args[0]
@@ -20,7 +21,6 @@ module ZabbixRubyClient
 
         info[:keyspace_total] = info[:keyspace_hits].to_i + info[:keyspace_misses].to_i
 
-        time = Time.now.to_i
         back = []
         back << "#{host} redis[role] #{time} #{info[:role]}"
         back << "#{host} redis[version] #{time} #{info[:redis_version]}"

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

@@ -4,18 +4,21 @@ module ZabbixRubyClient
   module Plugins
     module Sysinfo
       extend self
+      extend ZabbixRubyClient::PluginBase
 
       def collect(*args)
         host = args.delete_at(0)
         uname = `uname -a`
-        if $?.to_i == 0
+        case os
+        when :linux
           arch, hostname, kernel, kernel_version, machine, os_debian,
-          _, platform_debian, _, _, _, _, _, platform, os = uname.split(/ /)
+          _, platform_debian, _, _, _, _, _, platform, os = uname.split(/\s+/)
+        when :unix
+          os, hostname, _, platform, kernel, machine, kernel_version,
+          _, _, _, _, _, _, _, arch = uname.split(/\s+/)
         else
-          Log.warn "Are you running on ubuntu ?"
           return []
         end
-        time = Time.now.to_i
         back = []
         back << "#{host} sysinfo[name] #{time} #{host}"
         back << "#{host} sysinfo[arch] #{time} #{arch}"

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

@@ -4,6 +4,7 @@ module ZabbixRubyClient
   module Plugins
     module Who
       extend self
+      extend ZabbixRubyClient::PluginBase
 
       def collect(*args)
         host = args[0]
@@ -12,7 +13,6 @@ module ZabbixRubyClient
           Log.warn "Are you running on ubuntu ?"
           return []
         end
-        time = Time.now.to_i
         back = []
         back << "#{host} who[total] #{time} #{who}"
         return back

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

@@ -24,6 +24,7 @@ module ZabbixRubyClient
       ZabbixRubyClient::Log.set_logger(File.join(@logsdir, 'zrc.log'), @config['loglevel'])
       ZabbixRubyClient::Log.debug @config.inspect
       @is_22 = /v2\.[24]\./.match zabbix_sender_version
+      @is_30 = /3\.[024]\./.match zabbix_sender_version
       ZabbixRubyClient::Log.debug "zabbix sender version #{zabbix_sender_version}"
     end
 
@@ -45,7 +46,7 @@ module ZabbixRubyClient
       ZabbixRubyClient::Log.debug command
       begin
         res = `#{command}`
-        if @is_22
+        if @is_22 || @is_30
           case $?.to_i
           when 0
             ZabbixRubyClient::Log.debug "zabbix-sender: Data Sent (#{$?})"

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

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

data/spec/lib/plugins/apache_spec.rb

@@ -2,6 +2,7 @@
 
 require 'spec_helper'
 require 'webmock/rspec'
+require "zabbix-ruby-client/plugin_base"
 require "zabbix-ruby-client/plugins"
 ZabbixRubyClient::Plugins.scan_dirs ["zabbix-ruby-client/plugins"]
 require "zabbix-ruby-client/plugins/apache"

data/spec/lib/plugins/apt_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require "zabbix-ruby-client/plugin_base"
 require "zabbix-ruby-client/plugins"
 ZabbixRubyClient::Plugins.scan_dirs ["zabbix-ruby-client/plugins"]
 require "zabbix-ruby-client/plugins/apt"

data/spec/lib/plugins/disk_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require "zabbix-ruby-client/plugin_base"
 require "zabbix-ruby-client/plugins"
 ZabbixRubyClient::Plugins.scan_dirs ["zabbix-ruby-client/plugins"]
 require "zabbix-ruby-client/plugins/disk"
@@ -17,7 +18,7 @@ describe ZabbixRubyClient::Plugins::Disk do
   end
 
   it "launches a command to get disk space" do
-    expect(ZabbixRubyClient::Plugins::Disk).to receive(:`).with('df | grep "xx"')
+    expect(ZabbixRubyClient::Plugins::Disk).to receive(:`).with('df -k | grep "xx"')
     ZabbixRubyClient::Plugins::Disk.send(:diskinfo, 'xx')
   end
 

data/spec/lib/plugins/load_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require "zabbix-ruby-client/plugin_base"
 require "zabbix-ruby-client/plugins"
 ZabbixRubyClient::Plugins.scan_dirs ["zabbix-ruby-client/plugins"]
 require "zabbix-ruby-client/plugins/load"

data/spec/lib/plugins/memory_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require "zabbix-ruby-client/plugin_base"
 require "zabbix-ruby-client/plugins"
 ZabbixRubyClient::Plugins.scan_dirs ["zabbix-ruby-client/plugins"]
 require "zabbix-ruby-client/plugins/memory"

data/spec/lib/plugins/network_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require "zabbix-ruby-client/plugin_base"
 require "zabbix-ruby-client/plugins"
 ZabbixRubyClient::Plugins.scan_dirs ["zabbix-ruby-client/plugins"]
 require "zabbix-ruby-client/plugins/network"
@@ -18,25 +19,17 @@ describe ZabbixRubyClient::Plugins::Network do
   end
 
   it "prepare data to be usable" do
-    expected = [
-      "eth0:",
-      "8523363858",
-      "17554648",
-      "0",
-      "0",
-      "0",
-      "0",
-      "0",
-      "589997",
-      "2479556217",
-      "15780062",
-      "0",
-      "0",
-      "0",
-      "0",
-      "0",
-      "0"
-    ]
+    expected = {
+      :rx_drop => "0",
+      :rx_err => "0",
+      :rx_ok => "8523363858",
+      :rx_packets => "17554648",
+      :tx_drop => "0",
+      :tx_err => "0",
+      :tx_ok => "2479556217",
+      :tx_packets => "15780062"
+    }
+
     stubfile = File.expand_path('../../../../spec/files/system/net_dev', __FILE__)
     allow(ZabbixRubyClient::Plugins::Network).to receive(:getline).and_return(File.read(stubfile))
     data = ZabbixRubyClient::Plugins::Network.send(:get_info, 'eth0')

data/zabbix-ruby-client.gemspec

@@ -5,7 +5,7 @@ require 'zabbix-ruby-client/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "zabbix-ruby-client"
-  spec.version       = ZabbixRubyClient::VERSION
+  spec.version       = File.read(File.expand_path('../CHANGELOG.md', __FILE__))[/([0-9]+\.[0-9]+\.[0-9]+)/]
   spec.authors       = ["mose"]
   spec.email         = ["mose@mose.com"]
   spec.description   = %q{A zabbix alternative to zabbix-agent using zabbix-sender.}
@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "thor"
+  spec.add_dependency "thor", "~> 0.19"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "rake", "~> 10.4"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "webmock", "~> 1.20"
   spec.add_development_dependency "coveralls"
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: zabbix-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.20'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,6 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile-packaging
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -223,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: This tool is intended to use zabbix sender to propagate monitoring data for

data/Gemfile.lock

@@ -1,63 +0,0 @@
-PATH
-  remote: .
-  specs:
-    zabbix-ruby-client (0.1.2)
-      thor
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.6)
-    coveralls (0.7.1)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    mime-types (2.3)
-    multi_json (1.10.1)
-    netrc (0.7.7)
-    rake (10.3.2)
-    rest-client (1.7.2)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.4)
-    safe_yaml (1.0.3)
-    simplecov (0.9.0)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    thor (0.19.1)
-    tins (1.3.2)
-    webmock (1.18.0)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.3)
-  coveralls
-  rake
-  rspec (~> 3.0)
-  webmock
-  zabbix-ruby-client!