zabbix-ruby-client 0.0.20 → 0.0.21

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8b7c785e3e21c22e937319260db7d843e953c691
+  data.tar.gz: d768690cf80f157cca3cce5a154b67c147a721f9
+SHA512:
+  metadata.gz: 3bc559deeca1dd30f9fe176c589ce6de10fe626556c5e1fe9bab2f6851e1409e0086037f951fd377358d861cd001d1960ae031b5c86db50c1e0297170aa894ba
+  data.tar.gz: 072cc243d2329ea0631148846f908407385b0913fa4735f3ea55e4565742aaaebf5b769a859043b2035114100f35c4393b12d84c6a29699443c22170533a1311

data/.gitignore

@@ -12,4 +12,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-.settings
+.settings
+vendor/ruby

data/.ruby-version

@@ -0,0 +1 @@
+2.1

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 Zabbbix Ruby Client Changelog
 -----------------------------
 
+### v0.0.21 - 2014-08-01
+
+* fix zabbix_sender return code 256
+* update all templates with shorter history
+* added a simple openvpn plugin + template
+* small fix on network template
+* improved postgres template
+* add cisco template
+
 ### v0.0.20 - 2013-12-25
 
 * fix network plugin
@@ -27,7 +36,7 @@ Zabbbix Ruby Client Changelog
 
 ### v0.0.16 - 2013-10-31
 
-* _if you have custom plugins_ the class ZabbixRubyClient is now a module just for namespacing, update your code! 
+* _if you have custom plugins_ the class ZabbixRubyClient is now a module just for namespacing, update your code!
 * fix the logger
 * refactoring and more tests
 * adding travis and coverall to stimulate testing, also added gemnasium

data/README.md

@@ -96,9 +96,12 @@ There are a set of standart plugins included in the package, aimed at linux syst
 * 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)
   * args [ "/path/to/redis-cli", "options to connect" ]
+* openvpn (uses /etc/openvpn/openvpn-status.log) [openvpn_tpl](master/zabbix-templates/openvpn_tpl.xml)
+  * args [ "/etc/openvpn/openvpn-status.log" ]
+* cisco (type ASA 5510) [cisco_tpl](master/zabbix-templates/cisco_tpl.xml)
+  * uses a snmp setup
 
-
-You can add extra plugins in a plugins/ dir in the working dir, just by copying one of the existing plugins in the repo and change to your need. All plugins present in plugins/ will be loaded if present in the config file you use. That can be convenient to test by using the -t flag, for example `bundle exec zrc -t testplugin.yml` where testplugin.yml only contains the name and args for yoiur plugin.
+You can add extra plugins in a plugins/ dir in the working dir, just by copying one of the existing plugins in the repo and change to your need. All plugins present in plugins/ will be loaded if present in the config file you use. That can be convenient to test by using the -t flag, for example `bundle exec zrc -t testplugin.yml` where testplugin.yml only contains the name and args for your plugin.
 
 ## Custom plugins how-to
 
@@ -152,6 +155,8 @@ The zabbix ruby client has a pending system, that keeps the data if it was not s
 
 ## Note about security
 
+*note: I switched to usage of OpenVPN for communication between all my servers, which is much better than ssh tunnels, but this setup described below still is useful*
+
 As you may already know, Zabbix is not very concerned about securing exchanges between agent and server, or sender and server. A cautious sysadmin will then properly manage his setup using ssh tunneling.
 
 After launching manual tunnels and ensuring their survival with monit I tried `autossh` which is much more reliable. It requires to have keys exchanged from server and client, in my case I prefer doing reverse tunnels from server, because I have some plan about doing a resend from client in case server didn't open the tunnel (in case of server reboot or network failure). That resend trick is not implemented yet though.

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

@@ -37,5 +37,33 @@ module ZabbixRubyClient
       end
     end
 
+    def getlines(file, pattern=false)
+      lines = []
+      if File.readable? file
+        File.open(file,'r') do |f|
+          f.each do |l|
+            line = l.strip
+            if pattern
+              if Regexp.new(pattern).match line
+                Log.debug "File #{file}: #{line}"
+                lines << line
+              end
+            else
+               lines << line
+            end
+          end
+        end
+        Log.warn "File #{file}: pattern \"#{pattern}\" not found." unless lines.count > 0
+        lines
+      else
+        if File.file? file
+          Log.error "File not readable: #{file}"
+        else
+          Log.error "File not found: #{file}"
+        end
+        false
+      end
+    end
+
   end
 end

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

@@ -0,0 +1,55 @@
+# read the /etc/openvpn/openvpn-status.log file
+require "zabbix-ruby-client/logger"
+require "zabbix-ruby-client/plugin_base"
+
+module ZabbixRubyClient
+  module Plugins
+    module Ovpn
+      extend self
+      extend ZabbixRubyClient::PluginBase
+
+      def collect(*args)
+        host = args[0]
+        ovpnfile = args[1]
+        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']}"
+        end
+        back
+      end
+
+    private
+
+      def get_info(ovpnfile)
+        ret = {}
+        info = getlines(ovpnfile, "[^,]*,[^,]*,.* [0-9]{4}")
+        if info
+          received = 0
+          sent = 0
+          count = 0
+          info.each do |line|
+            if line[0] =~ /^[a-z]/
+              back = line.split(',')
+              received += back[2].to_i
+              sent += back[3].to_i
+              count += 1
+            end
+          end
+          ret["received"] = received
+          ret["sent"] = sent
+          ret["count"] = count
+          ret
+        else
+          false
+        end
+      end
+
+    end
+  end
+end
+
+ZabbixRubyClient::Plugins.register('ovpn', ZabbixRubyClient::Plugins::Ovpn)

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

@@ -20,12 +20,32 @@ module ZabbixRubyClient
           Log.warn "The connection failed."
           return []
         end
+        psqlactivity = `psql #{psqlargs} -A -t -c "select state, count(*) from pg_stat_activity group by state" #{dbname}`
+        if $?.to_i == 0
+          activity = get_activity(psqlactivity)
+        else
+          Log.warn "The connection failed."
+          return []
+        end
+        psqlwriter = `psql #{psqlargs} -A -t -c "select * from pg_stat_bgwriter" #{dbname}`
+        if $?.to_i == 0
+          writer = get_writer(psqlwriter)
+        else
+          Log.warn "The connection failed."
+          return []
+        end
 
         time = Time.now.to_i
         back = []
         status.each do |e,v|
           back << "#{host} postgres.#{e}[#{dbname}] #{time} #{v}"
         end
+        activity.each do |e,v|
+          back << "#{host} postgres.connections.#{e} #{time} #{v}"
+        end
+        writer.each do |e,v|
+          back << "#{host} postgres.#{e} #{time} #{v}"
+        end
         return back
       end
 
@@ -56,6 +76,31 @@ module ZabbixRubyClient
         ret
       end
 
+      def get_activity(status)
+        ar = { "active" => "0", "idle" => "0", "idle_in_transaction" => "0"}
+        status.each_line.reduce([]) do |a,l|
+          els = l.split("|").map(&:strip)
+          ar[els[0].gsub(" ","_")] = els[1]
+        end
+        ar
+      end
+
+      def get_writer(status)
+        ret = {}
+        els = status.split "|"
+        ret["checkpoints_timed"] = els[1]
+        ret["checkpoints_req"] = els[1]
+        ret["checkpoint_write_time"] = els[2]
+        ret["checkpoint_sync_time"] = els[3]
+        ret["buffers_checkpoint"] = els[4]
+        ret["buffers_clean"] = els[5]
+        ret["maxwritten_clean"] = els[6]
+        ret["buffers_backend"] = els[7]
+        ret["buffers_backend_fsync"] = els[8]
+        ret["buffers_alloc"] = els[9]
+        ret
+      end
+
     end
   end
 end

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

@@ -23,7 +23,6 @@ module ZabbixRubyClient
       ZabbixRubyClient::Plugins.scan_dirs([ PLUGINDIR ] + @config['plugindirs'])
       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
 
@@ -53,6 +52,10 @@ module ZabbixRubyClient
             @store.keepdata(file)
             ZabbixRubyClient::Log.error "zabbix-sender: Sending failed"
             ZabbixRubyClient::Log.error res
+          when 256
+            @store.keepdata(file)
+            ZabbixRubyClient::Log.warn "zabbix-sender: shit happens (unknown code 256)"
+            ZabbixRubyClient::Log.warn res
           when 512
             ZabbixRubyClient::Log.warn "zabbix-sender: Some values failed"
             ZabbixRubyClient::Log.warn res
@@ -84,5 +87,12 @@ module ZabbixRubyClient
       dir
     end
 
+    def zabbix_sender_version
+      v = `#{@config['zabbix']['sender']} -V &> /dev/null | head -1`
+      v.split(/\s/)[2]
+    rescue
+      false
+    end
+
   end
 end

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

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

data/spec/files/system/net_dev

@@ -1 +1 @@
-  eth0: 8523363858 17554648    0    0    0     0          0    589997 2479556217 15780062    0    0    0     0       0          0
+eth0: 8523363858 17554648    0    0    0     0          0    589997 2479556217 15780062    0    0    0     0       0          0

data/spec/lib/cli_spec.rb

@@ -27,22 +27,22 @@ describe ZabbixRubyClient::Cli do
   end
 
   it "init creates a working directory" do
-    expect(File.file? 'Gemfile').to be_true
+    expect(File.file? 'Gemfile').to be_truthy
   end
 
   it "show displays the list of data collected" do
-    ZabbixRubyClient::Runner.stub(:new).and_return(Object)
-    Object.stub(:collect)
-    Object.stub(:show)
+    allow(ZabbixRubyClient::Runner).to receive(:new).and_return(Object)
+    allow(Object).to receive(:collect)
+    allow(Object).to receive(:show)
     @cli.shell.mute do
       @cli.show
     end
   end
 
   it "upload collects and uploads the data from system" do
-    ZabbixRubyClient::Runner.stub(:new).and_return(Object)
-    Object.stub(:collect)
-    Object.stub(:upload)
+    allow(ZabbixRubyClient::Runner).to receive(:new).and_return(Object)
+    allow(Object).to receive(:collect)
+    allow(Object).to receive(:upload)
     @cli.shell.mute do
       @cli.upload
     end

data/spec/lib/data_spec.rb

@@ -33,7 +33,7 @@ describe ZabbixRubyClient::Data do
   end
 
   it "logs an error when plugin is not found" do
-    ZabbixRubyClient::Log.stub(:error).with("Plugin unknown_plugin not found.")
+    allow(ZabbixRubyClient::Runner).to receive(:error).with("Plugin unknown_plugin not found.")
     @data.run_plugin("unknown_plugin")
   end
 
@@ -44,17 +44,17 @@ describe ZabbixRubyClient::Data do
   end
 
   it "ignores buggy plugins" do
-    expect(@data.run_plugin("sample_buggy")).to be_true
+    expect(@data.run_plugin("sample_buggy")).to be_truthy
   end
 
   it "logs buggy plugins" do
-    ZabbixRubyClient::Log.stub(:fatal).with("Oops")
-    ZabbixRubyClient::Log.stub(:fatal).with("Exception")
+    allow(ZabbixRubyClient::Log).to receive(:fatal).with("Oops")
+    allow(ZabbixRubyClient::Log).to receive(:fatal).with("Exception")
     @data.run_plugin("sample_buggy")
   end
 
   it "merges collected and discovered data" do
-    Time.stub(:now).and_return("123456789")
+    allow(Time).to receive(:now).and_return("123456789")
     @data.run_plugin("sample")
     @data.run_plugin("sample_discover")
     result = ["host sample.discover 123456789 { \"data\": [ {\"{#SAMPLE}\": \"\"} ] }",

data/spec/lib/plugin_base_spec.rb

@@ -27,20 +27,20 @@ describe ZabbixRubyClient::PluginBase do
   end
 
   it "logs a debug entry when it extracts a line from a file" do
-    expect(ZabbixRubyClient::Log).to receive(:debug).with("File #{@stubfile}: #{@expected_line}")   
+    expect(ZabbixRubyClient::Log).to receive(:debug).with("File #{@stubfile}: #{@expected_line}")
     ZabbixRubyClient::PluginBase.getline(@stubfile, "eth0: ")
   end
 
   it "logs a warn entry when a line is not found in a file" do
-    expect(ZabbixRubyClient::Log).to receive(:warn).with("File #{@stubfile}: pattern \" xxx \" not found.")   
+    expect(ZabbixRubyClient::Log).to receive(:warn).with("File #{@stubfile}: pattern \" xxx \" not found.")
     x = ZabbixRubyClient::PluginBase.getline(@stubfile, " xxx ")
-    expect(x).to be_false
+    expect(x).to be_falsey
   end
 
   it "logs an error entry when a file is not found" do
     expect(ZabbixRubyClient::Log).to receive(:error).with("File not found: /tmp/xxxxx")
     x = ZabbixRubyClient::PluginBase.getline("/tmp/xxxxx", " xxx ")
-    expect(x).to be_false
+    expect(x).to be_falsey
   end
 
   it "logs an error entry when a file is not readable" do
@@ -48,7 +48,7 @@ describe ZabbixRubyClient::PluginBase do
     FileUtils.chmod 0300, "/tmp/xxxxx"
     expect(ZabbixRubyClient::Log).to receive(:error).with("File not readable: /tmp/xxxxx")
     x = ZabbixRubyClient::PluginBase.getline("/tmp/xxxxx", " xxx ")
-    expect(x).to be_false
+    expect(x).to be_falsey
   end
 
-end
+end

data/spec/lib/plugins/apache_spec.rb

@@ -79,7 +79,7 @@ describe ZabbixRubyClient::Plugins::Apache do
   it "collects data properly" do
     stub_request(:get, '127.0.0.1:80/server-status?auto').
       to_return({ :body => @data })
-    Time.stub(:now).and_return("123456789")
+    allow(Time).to receive(:now).and_return("123456789")
     data = ZabbixRubyClient::Plugins::Apache.send(:collect, 'local')
     expect(data).to eq @expected_data
   end

data/spec/lib/plugins/apt_spec.rb

@@ -24,20 +24,20 @@ describe ZabbixRubyClient::Plugins::Apt do
   it "prepare data to be usable" do
     expected = [23, 14]
     stubfile = File.expand_path('../../../../spec/files/system/apt-check', __FILE__)
-    ZabbixRubyClient::Plugins::Apt.stub(:aptinfo).and_return(File.read(stubfile))
+    allow(ZabbixRubyClient::Plugins::Apt).to receive(:aptinfo).and_return(File.read(stubfile))
     data = ZabbixRubyClient::Plugins::Apt.send(:get_info)
     expect(data).to eq expected
   end
 
   it "populate a hash with extracted data" do
     expected = [
-      "local apt[security] 123456789 23", 
-      "local apt[pending] 123456789 14", 
+      "local apt[security] 123456789 23",
+      "local apt[pending] 123456789 14",
       "local apt[status] 123456789 TODO apt 23/14"
     ]
     stubfile = File.expand_path('../../../../spec/files/system/apt-check', __FILE__)
-    ZabbixRubyClient::Plugins::Apt.stub(:aptinfo).and_return(File.read(stubfile))
-    Time.stub(:now).and_return("123456789")
+    allow(ZabbixRubyClient::Plugins::Apt).to receive(:aptinfo).and_return(File.read(stubfile))
+    allow(Time).to receive(:now).and_return("123456789")
     data = ZabbixRubyClient::Plugins::Apt.send(:collect, 'local')
     expect(data).to eq expected
   end

data/spec/lib/plugins/cpu_spec.rb

@@ -32,7 +32,7 @@ describe ZabbixRubyClient::Plugins::Cpu do
       "total" => 193453420
     }
     stubfile = File.expand_path('../../../../spec/files/system/proc_cpu', __FILE__)
-    ZabbixRubyClient::Plugins::Cpu.stub(:getline).and_return(File.read(stubfile))
+    allow(ZabbixRubyClient::Plugins::Cpu).to receive(:getline).and_return(File.read(stubfile))
     data = ZabbixRubyClient::Plugins::Cpu.send(:get_info)
     expect(data).to eq expected
   end
@@ -52,8 +52,8 @@ describe ZabbixRubyClient::Plugins::Cpu do
       "local cpu[total] 123456789 193453420"
     ]
     stubfile = File.expand_path('../../../../spec/files/system/proc_cpu', __FILE__)
-    ZabbixRubyClient::Plugins::Cpu.stub(:getline).and_return(File.read(stubfile))
-    Time.stub(:now).and_return("123456789")
+    allow(ZabbixRubyClient::Plugins::Cpu).to receive(:getline).and_return(File.read(stubfile))
+    allow(Time).to receive(:now).and_return("123456789")
     data = ZabbixRubyClient::Plugins::Cpu.send(:collect, 'local')
     expect(data).to eq expected
   end

data/spec/lib/plugins/disk_spec.rb

@@ -6,7 +6,7 @@ ZabbixRubyClient::Plugins.scan_dirs ["zabbix-ruby-client/plugins"]
 require "zabbix-ruby-client/plugins/disk"
 
 describe ZabbixRubyClient::Plugins::Disk do
-  
+
   before :all do
     @logfile = File.expand_path("../../files/logs/spec.log", __FILE__)
     ZabbixRubyClient::Log.set_logger(@logfile)
@@ -23,58 +23,58 @@ describe ZabbixRubyClient::Plugins::Disk do
 
   it "prepare data to be usable" do
     expected = [
-      "/dev/sda2", 
-      "288238944", 
-      "76560212", 
-      "197013928", 
-      "28%", 
-      "/home", 
-      "", 
-      "8", 
-      "1", 
-      "sda1", 
-      "974243", 
-      "695335", 
-      "37526290", 
-      "4648644", 
-      "711455", 
-      "785503", 
-      "27660904", 
-      "11097172", 
-      "0", 
-      "6283844", 
+      "/dev/sda2",
+      "288238944",
+      "76560212",
+      "197013928",
+      "28%",
+      "/home",
+      "",
+      "8",
+      "1",
+      "sda1",
+      "974243",
+      "695335",
+      "37526290",
+      "4648644",
+      "711455",
+      "785503",
+      "27660904",
+      "11097172",
+      "0",
+      "6283844",
       "15744924"
     ]
     stubfile_df = File.expand_path('../../../../spec/files/system/df', __FILE__)
     stubfile_io = File.expand_path('../../../../spec/files/system/diskstats', __FILE__)
-    ZabbixRubyClient::Plugins::Disk.stub(:diskinfo).and_return(File.read(stubfile_df))
-    ZabbixRubyClient::Plugins::Disk.stub(:getline).and_return(File.read(stubfile_io))
+    allow(ZabbixRubyClient::Plugins::Disk).to receive(:diskinfo).and_return(File.read(stubfile_df))
+    allow(ZabbixRubyClient::Plugins::Disk).to receive(:getline).and_return(File.read(stubfile_io))
     data = ZabbixRubyClient::Plugins::Disk.send(:get_info, 0, 0)
     expect(data).to eq expected
   end
 
   it "populate a hash with extracted data" do
     expected = [
-      "local disk.space[xxx,size] 123456789 288238944000", 
-      "local disk.space[xxx,used] 123456789 76560212000", 
-      "local disk.space[xxx,available] 123456789 197013928000", 
-      "local disk.space[xxx,percent_used] 123456789 28", 
-      "local disk.io[xxx,read_ok] 123456789 sda1", 
-      "local disk.io[xxx,read_merged] 123456789 974243", 
-      "local disk.io[xxx,read_sector] 123456789 695335", 
-      "local disk.io[xxx,read_time] 123456789 37526290", 
-      "local disk.io[xxx,write_ok] 123456789 4648644", 
-      "local disk.io[xxx,write_merged] 123456789 711455", 
-      "local disk.io[xxx,write_sector] 123456789 785503", 
-      "local disk.io[xxx,write_time] 123456789 27660904", 
-      "local disk.io[xxx,io_time] 123456789 11097172", 
+      "local disk.space[xxx,size] 123456789 288238944000",
+      "local disk.space[xxx,used] 123456789 76560212000",
+      "local disk.space[xxx,available] 123456789 197013928000",
+      "local disk.space[xxx,percent_used] 123456789 28",
+      "local disk.io[xxx,read_ok] 123456789 sda1",
+      "local disk.io[xxx,read_merged] 123456789 974243",
+      "local disk.io[xxx,read_sector] 123456789 695335",
+      "local disk.io[xxx,read_time] 123456789 37526290",
+      "local disk.io[xxx,write_ok] 123456789 4648644",
+      "local disk.io[xxx,write_merged] 123456789 711455",
+      "local disk.io[xxx,write_sector] 123456789 785503",
+      "local disk.io[xxx,write_time] 123456789 27660904",
+      "local disk.io[xxx,io_time] 123456789 11097172",
       "local disk.io[xxx,io_weighted] 123456789 0"
     ]
     stubfile_df = File.expand_path('../../../../spec/files/system/df', __FILE__)
     stubfile_io = File.expand_path('../../../../spec/files/system/diskstats', __FILE__)
-    ZabbixRubyClient::Plugins::Disk.stub(:diskinfo).and_return(File.read(stubfile_df))
-    ZabbixRubyClient::Plugins::Disk.stub(:getline).and_return(File.read(stubfile_io))
-    Time.stub(:now).and_return("123456789")
+    allow(ZabbixRubyClient::Plugins::Disk).to receive(:diskinfo).and_return(File.read(stubfile_df))
+    allow(ZabbixRubyClient::Plugins::Disk).to receive(:getline).and_return(File.read(stubfile_io))
+    allow(Time).to receive(:now).and_return("123456789")
     data = ZabbixRubyClient::Plugins::Disk.send(:collect, 'local', 'xxx', 'xxx')
     expect(data).to eq expected
   end
@@ -85,4 +85,4 @@ describe ZabbixRubyClient::Plugins::Disk do
     expect(data).to eq expected
   end
 
-end
+end

data/spec/lib/plugins/load_spec.rb

@@ -19,21 +19,21 @@ describe ZabbixRubyClient::Plugins::Load do
   it "prepare data to be usable" do
     expected = ["0.89", "1.29", "1.05", "2", "2768"]
     stubfile = File.expand_path('../../../../spec/files/system/loadavg', __FILE__)
-    ZabbixRubyClient::Plugins::Load.stub(:getline).and_return(File.read(stubfile).strip)
+    allow(ZabbixRubyClient::Plugins::Load).to receive(:getline).and_return(File.read(stubfile).strip)
     data = ZabbixRubyClient::Plugins::Load.send(:get_info)
     expect(data).to eq expected
   end
 
   it "populate a hash with extracted data" do
     expected = [
-      "local load[one] 123456789 0.89", 
+      "local load[one] 123456789 0.89",
       "local load[five] 123456789 1.29",
-      "local load[fifteen] 123456789 1.05", 
+      "local load[fifteen] 123456789 1.05",
       "local load[procs] 123456789 2"
     ]
     stubfile = File.expand_path('../../../../spec/files/system/loadavg', __FILE__)
-    ZabbixRubyClient::Plugins::Load.stub(:getline).and_return(File.read(stubfile))
-    Time.stub(:now).and_return("123456789")
+    allow(ZabbixRubyClient::Plugins::Load).to receive(:getline).and_return(File.read(stubfile))
+    allow(Time).to receive(:now).and_return("123456789")
     data = ZabbixRubyClient::Plugins::Load.send(:collect, 'local')
     expect(data).to eq expected
   end