zabbix-ruby-client 0.0.14 → 0.0.15

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1ee64f86d9fde1c3c037e228c7b1210063de95a4
+  data.tar.gz: cb9818f7a8a2a52c2b86be6210eae24c9d454908
+SHA512:
+  metadata.gz: 37097420a266843b8c5d3beb7747debcbf197117d62b3f5a0a15fec8ffe34d14f2820ccddebfb9f9ab2fe9335e231ec51fd9c920f11ac0d03d08543f4f31040e
+  data.tar.gz: 29485fb483e432aeb8458dc083f6e4ef1eee11c071e488b6ca554568802d693486c588945c95530c975d5468b5d7c15c6701bfad070b372d449cc3134b852925

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 Zabbbix Ruby Client Changelog
 -----------------------------
 
+### v0.0.15 - 2013-10-23
+
+* prototype of a way to keep data when sending fails and sending it again at next iteration
+* refactoring in several classes for better testability and nicer code
+* add port in the zabbix-sender command that was forgotten there
+* fix disk template alarm subject
+* fix datafile naming for when you get different task files ran at same time
+* improve cpu and disk triggers with dependencies (but waiting for ZBXNEXT-1229)
+
 ### v0.0.14 - 2013-10-14
 
 * better explanation about how to make custom plugins

data/README.md

@@ -10,6 +10,23 @@ The development is still in progress but it produces results and works in my cas
 
 Check the [Changelog](CHANGELOG.md) for recent changes, code is still under huge development and is likely to move a lot until version 0.1.
 
+## Why ?
+
+Yes why use zabbix ruby client with zabbix-sender rather than zabbix-agent ?
+
+There are various reasons for that. But the purpose of this tool ultimately is to fulfill the functions of the zabbix-sender, reducing the requirement of installation to only the zabbix ruby client.
+
+There are compromises that make this use of the sender with zabbix ruby client pertinent:
+
+* you prefer to rely on a cronjob rather than on a daemon for data collection
+* you don't mind having a minimum time between data collection of 1 minute (cron don't handle seconds)
+* you want to specify your discovery at client level rather than at server level. When I first used auto discovery for interfaces or file systems, it was discovering such a huge number of things with such a wide inconsistency of naming that it was pretty hard to think about a regexp to limit what was pertinent or not. Sometimes a discovery rule would need to have a regexp per host, which zabbix don't permit, or it gets very complicated. In a very diverse context, declarative discovery is much simpler.
+* you already have ruby installed on all your servers (which is the case if you use chef or puppet)
+
+The objectives for version 0.1 of zabbix ruby client are to be able to handle dropping connection by buffering the data collection and send all what was not sent the next time it's possible. So there should be no real difference on that feature with the agent.
+
+At some point all zabbix ruby client plugins will be usable by the agent as well, actually, so it should not make any difference. But the initial setup I have in my infrastructure led me to chose the sender rather than the agent. But that will be later on when the code will get better abstraction. For now I just want it to work and collect my data. Which it does. The full compatibility for use by the agent would probably be a target for version 0.2.
+
 ## Installation
 
 Install it yourself as:
@@ -53,7 +70,7 @@ Here is an example setup using the files generated by the init:
     0 * * * * /bin/zsh -c ". $HOME/.rvm/scripts/rvm && cd $HOME/zrc && bundle exec zrc upload -t hourly.yml"
     0 0 1 * * /bin/zsh -c ". $HOME/.rvm/scripts/rvm && cd $HOME/zrc && bundle exec zrc upload -t monthly.yml"
 
-## plugins
+## Plugins
 
 There are a set of standart plugins included in the package, aimed at linux systems.
 
@@ -70,7 +87,7 @@ There are a set of standart plugins included in the package, aimed at linux syst
 * 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)
 * 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) (unfinished)
+* redis (uses redis-cli info) [redis_tpl](master/zabbix-templates/redis_tpl.xml)
   * args [ "/path/to/redis-cli", "options to connect" ]
 
 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.
@@ -121,6 +138,10 @@ $ bundle exec zrc show -t myplugin.yml
 myhost myplugin[item] 1381669455 something 42
 ```
 
+## What is server or network goes down ?
+
+The zabbix ruby client has a pending system, that keeps the data if it was not sent, for sending it in the next iteration. Data is kept at each iteration until it's delivered (experimental feature).
+
 ## Note about security
 
 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.

data/lib/zabbix-ruby-client.rb

@@ -1,11 +1,13 @@
 require "zabbix-ruby-client/version"
 require "zabbix-ruby-client/logger"
 require "zabbix-ruby-client/plugins"
+require "zabbix-ruby-client/store"
+require "zabbix-ruby-client/data"
 require "yaml"
 
 class ZabbixRubyClient
 
-  def initialize(config_file,task_file)
+  def initialize(config_file, task_file)
     begin
       @config ||= YAML::load_file(config_file)
       if File.exists? task_file
@@ -18,87 +20,56 @@ class ZabbixRubyClient
       puts e.message
       return
     end
+
+    @store = Store.new(
+      @config['datadir'],
+      @config['zabbix']['host'],
+      File.basename(task_file,'.yml'),
+      @config['keepdata']
+    )
+
+    @data = Data.new(@config['host'])
+
+    @config["server"] = File.basename(config_file,'.yml')
     @logsdir = makedir(@config['logsdir'],'logs')
-    @datadir = makedir(@config['datadir'],'data')
     @plugindirs = [ File.expand_path("../zabbix-ruby-client/plugins", __FILE__) ]
     if @config["plugindirs"]
       @plugindirs = @plugindirs + @config["plugindirs"]
     end
-    @discover = {}
-    @data = []
     Plugins.load_dirs @plugindirs
     logger.debug @config.inspect
   end
 
-  def datafile
-    now = Time.now
-    @datafile ||= if @config['keepdata']
-      unless Dir.exists? File.join(@datadir,Time.now.strftime("%Y-%m-%d")) 
-        FileUtils.mkdir File.join(@datadir,Time.now.strftime("%Y-%m-%d")) 
-      end
-      File.join(@datadir,Time.now.strftime("%Y-%m-%d"),"data_"+Time.now.strftime("%H%M%S"))
-    else
-      File.join(@datadir,"data")
-    end
-  end
-
-  def run_plugin(plugin, args = nil)
-    Plugins.load(plugin) || logger.error( "Plugin #{plugin} not found.")
-    if Plugins.loaded[plugin]
-      begin
-        @data = @data + Plugins.loaded[plugin].send(:collect, @config['host'], *args)
-        if Plugins.loaded[plugin].respond_to?(:discover)
-          key, value = Plugins.loaded[plugin].send(:discover, *args)
-          @discover[key] ||= []
-          @discover[key] << [ value ]
-        end
-      rescue Exception => e
-        logger.fatal "Oops"
-        logger.fatal e.message
-      end
-    end
-  end
-
   def collect
     @tasks.each do |plugin|
-      run_plugin(plugin['name'], plugin['args'])
+      @data.run_plugin(plugin['name'], plugin['args'])
     end
   end
 
   def show
-    merge_discover
-    @data.each do |line|
+    @data.merge.each do |line|
       puts line
     end
   end
 
-  def store
-    File.open(datafile, "w") do |f|
-      @data.each do |d|
-        f.puts d
-      end
-    end
-  end
-
-  def merge_discover
-    time = Time.now.to_i
-    @data = @discover.reduce([]) do |a,(k,v)|
-      a << "#{@config['host']} #{k} #{time} { \"data\": [ #{v.join(', ')} ] }"
-      a
-    end + @data
-  end
-
   def upload
-    merge_discover
-    store
+    file = @store.record(@data.merge)
     begin
-      res = `#{@config['zabbix']['sender']} -z #{@config['zabbix']['host']} -T -i #{datafile}`
+      res = `#{@config['zabbix']['sender']} -z #{@config['zabbix']['host']} -p #{@config['zabbix']['port']} -T -i #{file}`
+      if $?.to_i != 0
+        @store.keepdata(file)
+      end
     rescue Exception => e
+      @store.keepdata(file)
       logger.error "Sending failed."
       logger.error e.message
     end
   end
 
+  def logger
+    @logger ||= Logger.get_logger(@logsdir, @config["loglevel"])
+  end
+
   private
 
   def makedir(configdir, defaultdir)
@@ -107,8 +78,4 @@ class ZabbixRubyClient
     dir
   end
 
-  def logger
-    @logger ||= Logger.get_logger(@logsdir, @config["loglevel"])
-  end
-
 end

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

@@ -0,0 +1,36 @@
+class ZabbixRubyClient
+  class Data
+
+    def initialize(host)
+      @discover = {}
+      @items = []
+      @host = host
+    end
+
+    def run_plugin(plugin, args = nil)
+      Plugins.load(plugin) || logger.error( "Plugin #{plugin} not found.")
+      if Plugins.loaded[plugin]
+        begin
+          @items += Plugins.loaded[plugin].send(:collect, @host, *args)
+          if Plugins.loaded[plugin].respond_to?(:discover)
+            key, value = Plugins.loaded[plugin].send(:discover, *args)
+            @discover[key] ||= []
+            @discover[key] << [ value ]
+          end
+        rescue Exception => e
+          logger.fatal "Oops"
+          logger.fatal e.message
+        end
+      end
+    end
+
+    def merge
+      time = Time.now.to_i
+      @discover.reduce([]) do |a,(k,v)|
+        a << "#{@host} #{k} #{time} { \"data\": [ #{v.join(', ')} ] }"
+        a
+      end + @items
+    end
+
+  end
+end

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

@@ -0,0 +1,55 @@
+class ZabbixRubyClient
+  class Store
+
+    def initialize(dir, server, task, keepdata=false)
+      @dir = dir
+      @server = server
+      @task = task
+      @keepdata = keepdata
+      @basename = "#{@server}-#{@task}-data"
+    end
+
+    def datafile
+      @datafile ||= if @keepdata
+        unless Dir.exists? File.join(@dir, Time.now.strftime("%Y-%m-%d"))
+          FileUtils.mkdir File.join(@dir, Time.now.strftime("%Y-%m-%d"))
+        end
+        File.join(@dir, Time.now.strftime("%Y-%m-%d"),"#{@basename}_"+Time.now.strftime("%H%M%S"))
+      else
+        File.join(@dir, @basename)
+      end
+    end
+
+    def record(data)
+      write(data, datafile, pending_content)
+    end
+
+    def keepdata(file)
+      FileUtils.mv(file, pendingfile)
+    end
+
+    def pendingfile
+      @pendingfile ||= File.join(@dir, "#{@server}-pending")
+    end
+
+    def pending_content
+      pending = ""
+      if File.exists? pendingfile
+        pending = File.open(pendingfile,'r').read
+        File.delete(pendingfile)
+      end
+      pending
+    end
+
+    def write(data, file, prepend = "")
+      File.open(file, "w") do |f|
+        f.write(prepend)
+        data.each do |d|
+          f.puts d
+        end
+      end
+      file
+    end
+
+  end
+end

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

@@ -1,3 +1,3 @@
 class ZabbixRubyClient
-  VERSION ||= "0.0.14"
+  VERSION ||= "0.0.15"
 end

data/spec/lib/data_spec.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+require 'spec_helper'
+require "zabbix-ruby-client/data"
+
+describe ZabbixRubyClient::Data do
+
+end

data/spec/lib/store_spec.rb

@@ -0,0 +1,80 @@
+# encoding: utf-8
+
+require 'spec_helper'
+require "zabbix-ruby-client/store"
+
+describe ZabbixRubyClient::Store do
+
+  before :all do
+    @datadir = File.expand_path("../../files/data", __FILE__)
+    @data = [ "1", "2" ]
+    @file = File.join(@datadir,"test")
+  end
+
+  before :each do
+    @store = ZabbixRubyClient::Store.new(@datadir, "server", "task")
+  end
+
+  after :each do
+    File.unlink(@file) if File.exists?(@file)
+    File.unlink(@store.pendingfile) if File.exists?(@store.pendingfile)
+  end
+
+  describe "write method" do
+
+    it ".write really writes a file" do
+      @store.write(@data,@file)
+      expect(File.exists?(@file)).to be true
+    end
+
+    it ".write record the data" do
+      file = File.join(@datadir,"test")
+      @store.write(@data,@file)
+      expect(File.read(@file)).to eq "1\n2\n"
+    end
+
+    it ".write record the data prepended if any" do
+      file = File.join(@datadir,"test")
+      @store.write(@data,@file, "something\n")
+      expect(File.read(@file)).to eq "something\n1\n2\n"
+    end
+
+    it ".write returns the name of the file" do
+      file = File.join(@datadir,"test")
+      expect(@store.write(@data,@file)).to eq @file
+    end
+
+  end
+
+  it "knows about pendingfile" do
+    expect(@store.pendingfile).to eq File.join(@datadir, "server-pending")
+  end
+
+  it "find no pending content if pending file is not here" do
+    expect(@store.pending_content).to eq ""
+  end
+
+  it "finds a pending content if there is a file" do
+    File.write(@store.pendingfile,"ha\n")
+    expect(@store.pending_content).to eq "ha\n"
+  end
+
+  it "erase the pendingfile if found" do
+    File.write(@store.pendingfile,"ha\n")
+    @store.pending_content
+    expect(File.exists?(@store.pendingfile)).to be false
+  end
+
+  it "keepdata moves the datafile" do
+    File.write(@file,"ha\n")
+    @store.keepdata(@file)
+    expect(File.exists?(@store.pendingfile)).to be true
+    expect(File.exists?(@file)).to be false
+  end
+
+  it "records data using the write method" do
+    expect(@store).to receive(:write).with(@data, @store.datafile, @store.pending_content)
+    @store.record(@data)
+  end
+
+end

data/spec/lib/zabbix-ruby-client_spec.rb

@@ -13,4 +13,4 @@ describe ZabbixRubyClient do
   pending "runs list of plugins according to config"
   pending "issues the upload command according to config"
 
-end
+end

data/spec/spec_helper.rb

@@ -7,4 +7,4 @@ RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end
-end
+end

data/zabbix-templates/apache_tpl.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>2.0</version>
-    <date>2013-10-01T06:29:18Z</date>
+    <date>2013-10-17T21:37:42Z</date>
     <groups>
         <group>
             <name>3. Service Apache</name>
@@ -30,7 +30,7 @@
                     <snmp_oid/>
                     <key>apache[BusyWorkers]</key>
                     <delay>0</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>3</value_type>
@@ -69,7 +69,7 @@
                     <snmp_oid/>
                     <key>apache[BytesPerReq]</key>
                     <delay>0</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
@@ -108,7 +108,7 @@
                     <snmp_oid/>
                     <key>apache[BytesPerSec]</key>
                     <delay>0</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
@@ -147,7 +147,7 @@
                     <snmp_oid/>
                     <key>apache[c_closing]</key>
                     <delay>0</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>3</value_type>
@@ -186,7 +186,7 @@
                     <snmp_oid/>
                     <key>apache[CPULoad]</key>
                     <delay>0</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
@@ -225,7 +225,7 @@
                     <snmp_oid/>
                     <key>apache[c_dns]</key>
                     <delay>0</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>3</value_type>
@@ -264,7 +264,7 @@
                     <snmp_oid/>
                     <key>apache[FreeWorkers]</key>
                     <delay>60</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
@@ -303,7 +303,7 @@
                     <snmp_oid/>
                     <key>apache[c_finish]</key>
                     <delay>0</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>3</value_type>
@@ -334,6 +334,47 @@
                     </applications>
                     <valuemap/>
                 </item>
+                <item>
+                    <name>HTTP Check</name>
+                    <type>3</type>
+                    <snmp_community/>
+                    <multiplier>0</multiplier>
+                    <snmp_oid/>
+                    <key>net.tcp.service[http]</key>
+                    <delay>30</delay>
+                    <history>90</history>
+                    <trends>365</trends>
+                    <status>0</status>
+                    <value_type>3</value_type>
+                    <allowed_hosts/>
+                    <units/>
+                    <delta>0</delta>
+                    <snmpv3_securityname/>
+                    <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                    <snmpv3_authpassphrase/>
+                    <snmpv3_privpassphrase/>
+                    <formula>1</formula>
+                    <delay_flex/>
+                    <params/>
+                    <ipmi_sensor/>
+                    <data_type>3</data_type>
+                    <authtype>0</authtype>
+                    <username/>
+                    <password/>
+                    <publickey/>
+                    <privatekey/>
+                    <port/>
+                    <description/>
+                    <inventory_link>0</inventory_link>
+                    <applications>
+                        <application>
+                            <name>APACHE</name>
+                        </application>
+                    </applications>
+                    <valuemap>
+                        <name>Service state</name>
+                    </valuemap>
+                </item>
                 <item>
                     <name>Idle</name>
                     <type>2</type>
@@ -342,7 +383,7 @@
                     <snmp_oid/>
                     <key>apache[c_idle]</key>
                     <delay>0</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>3</value_type>
@@ -381,7 +422,7 @@
                     <snmp_oid/>
                     <key>apache[c_cleanup]</key>
                     <delay>0</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>3</value_type>
@@ -420,7 +461,7 @@
                     <snmp_oid/>
                     <key>apache[IdleWorkers]</key>
                     <delay>0</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>3</value_type>
@@ -459,7 +500,7 @@
                     <snmp_oid/>
                     <key>apache[c_keep]</key>
                     <delay>0</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>3</value_type>
@@ -498,7 +539,7 @@
                     <snmp_oid/>
                     <key>apache[c_log]</key>
                     <delay>0</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>3</value_type>
@@ -537,7 +578,7 @@
                     <snmp_oid/>
                     <key>apache[c_read]</key>
                     <delay>0</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>3</value_type>
@@ -576,7 +617,7 @@
                     <snmp_oid/>
                     <key>apache[ReqPerSec]</key>
                     <delay>0</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
@@ -615,7 +656,7 @@
                     <snmp_oid/>
                     <key>apache[c_send]</key>
                     <delay>0</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>3</value_type>
@@ -654,7 +695,7 @@
                     <snmp_oid/>
                     <key>apache[c_start]</key>
                     <delay>0</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>3</value_type>
@@ -693,7 +734,7 @@
                     <snmp_oid/>
                     <key>apache[TotalAccesses]</key>
                     <delay>0</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>3</value_type>
@@ -732,7 +773,7 @@
                     <snmp_oid/>
                     <key>apache[TotalKBytes]</key>
                     <delay>0</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
@@ -771,7 +812,7 @@
                     <snmp_oid/>
                     <key>apache[Uptime]</key>
                     <delay>0</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
@@ -810,7 +851,7 @@
                     <snmp_oid/>
                     <key>apache[c_waiting]</key>
                     <delay>0</delay>
-                    <history>7</history>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>3</value_type>
@@ -916,6 +957,18 @@
             </screens>
         </template>
     </templates>
+    <triggers>
+        <trigger>
+            <expression>{Apache Stats:net.tcp.service[http].last(0)}=0</expression>
+            <name>Apache Down</name>
+            <url/>
+            <status>0</status>
+            <priority>5</priority>
+            <description/>
+            <type>0</type>
+            <dependencies/>
+        </trigger>
+    </triggers>
     <graphs>
         <graph>
             <name>Apache connections</name>

data/zabbix-templates/cpu_tpl.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>2.0</version>
-    <date>2013-10-01T06:29:53Z</date>
+    <date>2013-10-19T08:17:55Z</date>
     <groups>
         <group>
             <name>3. Service Ubuntu</name>
@@ -850,7 +850,7 @@
     </templates>
     <triggers>
         <trigger>
-            <expression>{CPU zrc:cpu[used_percent].max(120)}&gt;90</expression>
+            <expression>{CPU zrc:cpu[used_percent].min(120)}&gt;90</expression>
             <name>extreme CPU use</name>
             <url/>
             <status>0</status>
@@ -860,14 +860,19 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{CPU zrc:cpu[used_percent].max(120)}&gt;80</expression>
+            <expression>{CPU zrc:cpu[used_percent].min(120)}&gt;80</expression>
             <name>high CPU use</name>
             <url/>
             <status>0</status>
             <priority>2</priority>
             <description/>
             <type>0</type>
-            <dependencies/>
+            <dependencies>
+                <dependency>
+                    <name>extreme CPU use</name>
+                    <expression>{CPU zrc:cpu[used_percent].min(120)}&gt;90</expression>
+                </dependency>
+            </dependencies>
         </trigger>
     </triggers>
     <graphs>

data/zabbix-templates/disk_tpl.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>2.0</version>
-    <date>2013-10-01T06:30:08Z</date>
+    <date>2013-10-19T08:26:07Z</date>
     <groups>
         <group>
             <name>3. Service Ubuntu</name>
@@ -598,29 +598,29 @@
                     </item_prototypes>
                     <trigger_prototypes>
                         <trigger_prototype>
-                            <expression>{Disk Stats:disk.space[{#DISK_DEVICE},percent_used].last(0)}&gt;80</expression>
-                            <name>{HOST.NAME} Disk (#DISK_MOUNT} full &gt; $1 %</name>
+                            <expression>{Disk Stats:disk.space[{#DISK_DEVICE},percent_used].last(0)}&gt;90 &amp; {Disk Stats:disk.space[{#DISK_DEVICE},percent_used].last(0)}&lt;95</expression>
+                            <name>{HOST.NAME} Disk {#DISK_MOUNT} full &gt; $1 %</name>
                             <url/>
                             <status>0</status>
-                            <priority>2</priority>
+                            <priority>3</priority>
                             <description/>
                             <type>0</type>
                         </trigger_prototype>
                         <trigger_prototype>
-                            <expression>{Disk Stats:disk.space[{#DISK_DEVICE},percent_used].last(0)}&gt;95</expression>
-                            <name>{HOST.NAME} Disk (#DISK_MOUNT} full &gt; $1 %</name>
+                            <expression>{Disk Stats:disk.space[{#DISK_DEVICE},percent_used].last(0)}&gt;80 &amp; {Disk Stats:disk.space[{#DISK_DEVICE},percent_used].last(0)}&lt;90</expression>
+                            <name>{HOST.NAME} Disk {#DISK_MOUNT} full &gt; $1 %</name>
                             <url/>
                             <status>0</status>
-                            <priority>4</priority>
+                            <priority>2</priority>
                             <description/>
                             <type>0</type>
                         </trigger_prototype>
                         <trigger_prototype>
-                            <expression>{Disk Stats:disk.space[{#DISK_DEVICE},percent_used].last(0)}&gt;90</expression>
-                            <name>{HOST.NAME} Disk (#DISK_MOUNT} full &gt; $1 %</name>
+                            <expression>{Disk Stats:disk.space[{#DISK_DEVICE},percent_used].last(0)}&gt;95</expression>
+                            <name>{HOST.NAME} Disk {#DISK_MOUNT} full &gt; $1 %</name>
                             <url/>
                             <status>0</status>
-                            <priority>3</priority>
+                            <priority>4</priority>
                             <description/>
                             <type>0</type>
                         </trigger_prototype>

data/zabbix-templates/nginx_tpl.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>2.0</version>
-    <date>2013-10-08T11:40:24Z</date>
+    <date>2013-10-17T21:38:16Z</date>
     <groups>
         <group>
             <name>3. Service Nginx</name>
@@ -217,6 +217,47 @@
                     </applications>
                     <valuemap/>
                 </item>
+                <item>
+                    <name>NGINX Check</name>
+                    <type>3</type>
+                    <snmp_community/>
+                    <multiplier>0</multiplier>
+                    <snmp_oid/>
+                    <key>net.tcp.service[http]</key>
+                    <delay>30</delay>
+                    <history>90</history>
+                    <trends>365</trends>
+                    <status>0</status>
+                    <value_type>3</value_type>
+                    <allowed_hosts/>
+                    <units/>
+                    <delta>0</delta>
+                    <snmpv3_securityname/>
+                    <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                    <snmpv3_authpassphrase/>
+                    <snmpv3_privpassphrase/>
+                    <formula>1</formula>
+                    <delay_flex/>
+                    <params/>
+                    <ipmi_sensor/>
+                    <data_type>3</data_type>
+                    <authtype>0</authtype>
+                    <username/>
+                    <password/>
+                    <publickey/>
+                    <privatekey/>
+                    <port/>
+                    <description/>
+                    <inventory_link>0</inventory_link>
+                    <applications>
+                        <application>
+                            <name>Nginx</name>
+                        </application>
+                    </applications>
+                    <valuemap>
+                        <name>Service state</name>
+                    </valuemap>
+                </item>
                 <item>
                     <name>Requests per second</name>
                     <type>2</type>
@@ -263,6 +304,18 @@
             <screens/>
         </template>
     </templates>
+    <triggers>
+        <trigger>
+            <expression>{Nginx:net.tcp.service[http].last(0)}=0</expression>
+            <name>NGINX Down</name>
+            <url/>
+            <status>0</status>
+            <priority>5</priority>
+            <description/>
+            <type>0</type>
+            <dependencies/>
+        </trigger>
+    </triggers>
     <graphs>
         <graph>
             <name>Nginx Connections</name>

data/zabbix-templates/redis_tpl.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>2.0</version>
-    <date>2013-10-14T11:20:44Z</date>
+    <date>2013-10-14T11:47:48Z</date>
     <groups>
         <group>
             <name>3. Service Ubuntu</name>
@@ -501,5 +501,37 @@
                 </graph_item>
             </graph_items>
         </graph>
+        <graph>
+            <name>s. Redis Commands</name>
+            <width>900</width>
+            <height>200</height>
+            <yaxismin>0.0000</yaxismin>
+            <yaxismax>100.0000</yaxismax>
+            <show_work_period>1</show_work_period>
+            <show_triggers>0</show_triggers>
+            <type>0</type>
+            <show_legend>0</show_legend>
+            <show_3d>0</show_3d>
+            <percent_left>0.0000</percent_left>
+            <percent_right>0.0000</percent_right>
+            <ymin_type_1>0</ymin_type_1>
+            <ymax_type_1>0</ymax_type_1>
+            <ymin_item_1>0</ymin_item_1>
+            <ymax_item_1>0</ymax_item_1>
+            <graph_items>
+                <graph_item>
+                    <sortorder>0</sortorder>
+                    <drawtype>5</drawtype>
+                    <color>C80000</color>
+                    <yaxisside>0</yaxisside>
+                    <calc_fnc>2</calc_fnc>
+                    <type>0</type>
+                    <item>
+                        <host>Redis</host>
+                        <key>redis[commands]</key>
+                    </item>
+                </graph_item>
+            </graph_items>
+        </graph>
     </graphs>
 </zabbix_export>

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: zabbix-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.0.14
-  prerelease: 
+  version: 0.0.15
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-10-22 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
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,33 +41,29 @@ 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'
 description: A zabbix alternative to zabbix-agent using zabbix-sender.
@@ -92,6 +83,7 @@ files:
 - bin/zrc
 - lib/zabbix-ruby-client.rb
 - lib/zabbix-ruby-client/cli.rb
+- lib/zabbix-ruby-client/data.rb
 - lib/zabbix-ruby-client/logger.rb
 - lib/zabbix-ruby-client/plugins.rb
 - lib/zabbix-ruby-client/plugins/apache.rb
@@ -106,6 +98,7 @@ files:
 - lib/zabbix-ruby-client/plugins/redis.rb
 - lib/zabbix-ruby-client/plugins/sysinfo.rb
 - lib/zabbix-ruby-client/plugins/who.rb
+- lib/zabbix-ruby-client/store.rb
 - lib/zabbix-ruby-client/version.rb
 - spec/files/config.yml
 - spec/files/plugins/apache_status
@@ -114,6 +107,7 @@ files:
 - spec/files/plugins/netstat
 - spec/files/plugins/vmstat
 - spec/lib/cli_spec.rb
+- spec/lib/data_spec.rb
 - spec/lib/logger_spec.rb
 - spec/lib/plugins/apache_spec.rb
 - spec/lib/plugins/cpu_spec.rb
@@ -121,6 +115,7 @@ files:
 - spec/lib/plugins/memory_spec.rb
 - spec/lib/plugins/network_spec.rb
 - spec/lib/plugins_spec.rb
+- spec/lib/store_spec.rb
 - spec/lib/zabbix-ruby-client_spec.rb
 - spec/spec_helper.rb
 - templates/client/Gemfile
@@ -146,33 +141,26 @@ 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: 2522849002021600929
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2522849002021600929
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This tool is intended to use zabbix sender to propagate monitoring data for
   Zabbix server.
 test_files:
@@ -183,6 +171,7 @@ test_files:
 - spec/files/plugins/netstat
 - spec/files/plugins/vmstat
 - spec/lib/cli_spec.rb
+- spec/lib/data_spec.rb
 - spec/lib/logger_spec.rb
 - spec/lib/plugins/apache_spec.rb
 - spec/lib/plugins/cpu_spec.rb
@@ -190,5 +179,6 @@ test_files:
 - spec/lib/plugins/memory_spec.rb
 - spec/lib/plugins/network_spec.rb
 - spec/lib/plugins_spec.rb
+- spec/lib/store_spec.rb
 - spec/lib/zabbix-ruby-client_spec.rb
 - spec/spec_helper.rb