zabbix-ruby-client 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19e7e397ae47c0fdb6dd18955e819231db4f3c76
-  data.tar.gz: 48ddc4da7f27c201f00462dfdd97e54a1d41fca9
+  metadata.gz: f6ca5d569fa5a14fcd429f4a4715dbf40dd59c0a
+  data.tar.gz: e923105d8540ebea6479448c03d434c6075fa7b7
 SHA512:
-  metadata.gz: 05d85cb4bfea25f1ee9e8e9cdc2f227776541af4daa38883e72c73ae55135a5cd25434d8b035399eae5f8370fb086fe63af91c12f7f27dd465c15147b33ddb7d
-  data.tar.gz: deac2a1dbc3eefc397a77ce15baba5287f67d7908c14353b209356159aa515671bbc1fdff496708beb0af1d8d97b9d9607a73eda2e06ed7173e62024dc0eaff3
+  metadata.gz: f596cc9dee5ab9ccf630e82c77b7644dc247bea00a42ed3db8d0b680fba98dd01b573cda616a3217d444770ef31d462a8567bd22fe41576663cdab4f98f10698
+  data.tar.gz: 4849799d77077d96ff27385ceaaa1fd867106c7786f4057e5ac989af09945b97af881aeee74f1ddd1d13c0320b28bdff53fbf492985ce83693abf0da4ac61fd4

data/.coveralls.yml

@@ -1 +1 @@
-repo_token: Oej1FGJWwMJdJPP5si37KoXFU3EcLQH9v
+repo_token: uCejqmEVoAZ4LyEAvmDIBBA8yXG7WTDaO

data/.gitignore

@@ -13,3 +13,6 @@ test/version_tmp
 tmp
 .settings
 vendor/ruby
+zrc-*
+packaging/traveling-*
+packaging/vendor/

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Zabbbix Ruby Client Changelog
 -----------------------------
 
+### 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
+- make sysinfo plugin work on debian wheezy
+- add a packaging script based on flying ruby
+
 ### v0.1.1 - 2014-08-28
 - add link to the chef cookbook
 - better backtrace error in case a plugin crashes

data/Gemfile-packaging

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem "thor"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zabbix-ruby-client (0.1.1)
+    zabbix-ruby-client (0.1.2)
       thor
 
 GEM

data/README.md

@@ -3,10 +3,10 @@ Zabbix Ruby Client
 
 [![Gem Version](http://img.shields.io/gem/v/zabbix-ruby-client.svg)](http://rubygems.org/gems/zabbix-ruby-client)
 [![Downloads](http://img.shields.io/gem/dt/zabbix-ruby-client.svg)](https://rubygems.org/gems/zabbix-ruby-client)
-[![Build Status](http://img.shields.io/travis/eduvo/zabbix-ruby-client.svg)](https://travis-ci.org/eduvo/zabbix-ruby-client)
-[![Coverage Status](http://img.shields.io/coveralls/eduvo/zabbix-ruby-client.svg)](https://coveralls.io/r/eduvo/zabbix-ruby-client?branch=master)
-[![Dependency Status](https://gemnasium.com/eduvo/zabbix-ruby-client.png)](https://gemnasium.com/eduvo/zabbix-ruby-client)
-[![Code Climate](http://img.shields.io/codeclimate/github/eduvo/zabbix-ruby-client.svg)](https://codeclimate.com/github/eduvo/zabbix-ruby-client)
+[![Build Status](http://img.shields.io/travis/mose/zabbix-ruby-client.svg)](https://travis-ci.org/mose/zabbix-ruby-client)
+[![Coverage Status](http://img.shields.io/coveralls/mose/zabbix-ruby-client.svg)](https://coveralls.io/r/mose/zabbix-ruby-client?branch=master)
+[![Dependency Status](https://gemnasium.com/mose/zabbix-ruby-client.png)](https://gemnasium.com/mose/zabbix-ruby-client)
+[![Code Climate](http://img.shields.io/codeclimate/github/mose/zabbix-ruby-client.svg)](https://codeclimate.com/github/mose/zabbix-ruby-client)
 
 ----
 
@@ -86,7 +86,7 @@ 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.
 
-* **ubuntu** system stats ([system_tpl](master/zabbix-templates/system_tpl.xml) includes the following)
+* **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)
@@ -95,6 +95,7 @@ There are a set of standart plugins included in the package, aimed at linux syst
   * **network** (uses /proc/net/dev) [network_tpl](master/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)
@@ -230,6 +231,15 @@ Then you can change zabbix-server config and add a localhost ListenIP (by defaul
 ListenIP 127.0.0.1
 ```
 
+## Standalone packaging
+
+From the source repository it's possible to build a tarball directly usable on any server, without the need to install ruby on it.
+
+    rake package:linux:x86
+
+Available arch are x86, x86_64 and osx (provided by flying ruby toolkit).
+
+
 ## Todo
 
 * publish a chef cookbook for system wide installation
@@ -261,4 +271,4 @@ ListenIP 127.0.0.1
 
 ## License
 
-Copyright 2013 [Faria Systems](http://faria.co) - MIT license - created by mose at mose.com
+Copyright 2013-2014 [Faria Systems](http://faria.co) - MIT license - created by mose at mose.com

data/Rakefile

@@ -1,9 +1,11 @@
 #!/usr/bin/env rake
-# begin
-#   require 'bundler/setup'
-# rescue LoadError
-#   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-# end
+
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
 require "bundler/gem_tasks"
 require "rake/testtask"
 require "rspec/core/rake_task" # RSpec 2.0
@@ -17,3 +19,84 @@ task :spec do
 end
 
 task :default => :spec
+
+PACKAGE_NAME = "zrc"
+VERSION = "0.1.2"
+TRAVELING_RUBY_VERSION = "20141215-2.1.5"
+
+desc "Package your app"
+task :package => ['package:linux:x86', 'package:linux:x86_64', 'package:osx']
+
+namespace :package do
+  namespace :linux do
+    desc "Package your app for Linux x86"
+    task :x86 => [:bundle_install, "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86.tar.gz"] do
+      create_package("linux-x86")
+    end
+
+    desc "Package your app for Linux x86_64"
+    task :x86_64 => [:bundle_install, "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz"] do
+      create_package("linux-x86_64")
+    end
+  end
+
+  desc "Package your app for OS X"
+  task :osx => [:bundle_install, "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz"] do
+    create_package("osx")
+  end
+
+  desc "Install gems to local directory"
+  task :bundle_install do
+    if RUBY_VERSION !~ /^2\.1\./
+      abort "You can only 'bundle install' using Ruby 2.1, because that's what Traveling Ruby uses."
+    end
+    sh "rm -rf packaging/tmp"
+    sh "mkdir packaging/tmp"
+    sh "cp Gemfile-packaging packaging/tmp/Gemfile"
+    Bundler.with_clean_env do
+      sh "cd packaging/tmp && env BUNDLE_IGNORE_CONFIG=1 bundle install --path ../vendor --without development"
+    end
+    sh "cp packaging/tmp/Gemfile packaging/tmp/Gemfile.lock packaging"
+    sh "rm -rf packaging/tmp"
+    sh "rm -f packaging/vendor/*/*/cache/*"
+  end
+end
+
+file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86.tar.gz" do
+  download_runtime("linux-x86")
+end
+
+file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz" do
+  download_runtime("linux-x86_64")
+end
+
+file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz" do
+  download_runtime("osx")
+end
+
+def create_package(target)
+  package_dir = "#{PACKAGE_NAME}-#{VERSION}-#{target}"
+  sh "rm -rf #{package_dir}"
+  sh "mkdir #{package_dir}"
+  sh "mkdir #{package_dir}/config-sample"
+  sh "mkdir -p #{package_dir}/lib/app"
+  sh "cp bin/zrc #{package_dir}/lib/app/"
+  sh "cp -r lib #{package_dir}/lib/app/lib"
+  sh "cp -r templates/client/*.yml #{package_dir}/config-sample"
+  sh "mkdir #{package_dir}/lib/ruby"
+  sh "tar -xzf packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}.tar.gz -C #{package_dir}/lib/ruby"
+  sh "cp packaging/run.sh #{package_dir}/zrc"
+  sh "cp -pR packaging/vendor #{package_dir}/lib/"
+  sh "cp packaging/Gemfile packaging/Gemfile.lock #{package_dir}/lib/vendor/"
+  sh "mkdir #{package_dir}/lib/vendor/.bundle"
+  sh "cp packaging/bundler-config #{package_dir}/lib/vendor/.bundle/config"
+  if !ENV['DIR_ONLY']
+    sh "tar -czf #{package_dir}.tar.gz #{package_dir}"
+    sh "rm -rf #{package_dir}"
+  end
+end
+
+def download_runtime(target)
+  sh "cd packaging && curl -L -O --fail " +
+    "http://d6r77u77i8pq3.cloudfront.net/releases/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}.tar.gz"
+end

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

@@ -36,7 +36,7 @@ module ZabbixRubyClient
     private
 
       def get_info(interface)
-        info = getline("/proc/net/dev", "#{interface}: ")
+        info = getline("/proc/net/dev", "#{interface}:")
         if info
           info.split(/\s+/)
         else

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

@@ -9,8 +9,8 @@ module ZabbixRubyClient
         host = args.delete_at(0)
         uname = `uname -a`
         if $?.to_i == 0
-          arch, hostname, kernel, kernel_version, machine, proc,
-          _, _, _, _, _, _, _, platform, os = uname.split(/ /)
+          arch, hostname, kernel, kernel_version, machine, os_debian,
+          _, platform_debian, _, _, _, _, _, platform, os = uname.split(/ /)
         else
           Log.warn "Are you running on ubuntu ?"
           return []
@@ -23,8 +23,8 @@ module ZabbixRubyClient
         back << "#{host} sysinfo[kernel] #{time} #{kernel}"
         back << "#{host} sysinfo[kernel_version] #{time} #{kernel_version}"
         back << "#{host} sysinfo[machine] #{time} #{machine}"
-        back << "#{host} sysinfo[platform] #{time} #{platform}"
-        back << "#{host} sysinfo[os] #{time} #{os}"
+        back << "#{host} sysinfo[platform] #{time} #{platform || platform_debian}"
+        back << "#{host} sysinfo[os] #{time} #{os || os_debian}"
         Hash[*args].each do |k,v|
           back << "#{host} sysinfo[#{k}] #{time} #{v}"
         end

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

@@ -23,7 +23,7 @@ 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
-      @is_22 = /v2\.2\./.match zabbix_sender_version
+      @is_22 = /v2\.[24]\./.match zabbix_sender_version
       ZabbixRubyClient::Log.debug "zabbix sender version #{zabbix_sender_version}"
     end
 

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

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

data/packaging/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem "thor"

data/packaging/Gemfile.lock

@@ -0,0 +1,10 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    thor (0.19.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  thor

data/packaging/bundler-config

@@ -0,0 +1,3 @@
+BUNDLE_PATH: .
+BUNDLE_WITHOUT: development
+BUNDLE_DISABLE_SHARED_GEMS: '1'

data/packaging/run.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+# Figure out where this script is located.
+SELFDIR="`dirname \"$0\"`"
+SELFDIR="`cd \"$SELFDIR\" && pwd`"
+
+export BUNDLE_GEMFILE="$SELFDIR/lib/vendor/Gemfile"
+unset BUNDLE_IGNORE_CONFIG
+
+# Run the actual app using the bundled Ruby interpreter.
+exec "$SELFDIR/lib/ruby/bin/ruby" -rbundler/setup -I$SELFDIR/lib/app/lib "$SELFDIR/lib/app/zrc" $@

data/spec/lib/data_spec.rb

@@ -50,6 +50,7 @@ describe ZabbixRubyClient::Data do
   it "logs buggy plugins" do
     allow(ZabbixRubyClient::Log).to receive(:fatal).with("Oops")
     allow(ZabbixRubyClient::Log).to receive(:fatal).with("Exception")
+    allow(ZabbixRubyClient::Log).to receive(:fatal)
     @data.run_plugin("sample_buggy")
   end
 

data/zabbix-templates/apache_tpl.xml

@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>2.0</version>
-    <date>2014-01-02T03:31:10Z</date>
+    <date>2015-01-17T21:09:42Z</date>
     <groups>
         <group>
-            <name>3. Service Apache</name>
+            <name>3. apache</name>
         </group>
     </groups>
     <templates>
         <template>
             <template>Apache Stats</template>
             <name>Apache (zrc)</name>
+            <description/>
             <groups>
                 <group>
-                    <name>3. Service Apache</name>
+                    <name>3. apache</name>
                 </group>
             </groups>
             <applications>
@@ -63,6 +64,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Bytes / Request</name>
@@ -105,6 +107,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Bytes / Seconds</name>
@@ -147,6 +150,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Closing Connection.</name>
@@ -189,6 +193,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU Load</name>
@@ -231,6 +236,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>DNS Lookup</name>
@@ -273,6 +279,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Free workers</name>
@@ -298,7 +305,7 @@
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex/>
-                    <params>100*last(&quot;apache[IdleWorkers]&quot;)/(last(&quot;apache[BusyWorkers]&quot;) + last(&quot;apache[IdleWorkers]&quot;))</params>
+                    <params>100*last(&quot;apache[IdleWorkers]&quot;)/(last(&quot;apache[BusyWorkers]&quot;)+last(&quot;apache[IdleWorkers]&quot;))</params>
                     <ipmi_sensor/>
                     <data_type>0</data_type>
                     <authtype>0</authtype>
@@ -315,6 +322,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Gracefully Finishing</name>
@@ -357,6 +365,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>HTTP Check</name>
@@ -401,6 +410,7 @@
                     <valuemap>
                         <name>Service state</name>
                     </valuemap>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Idle</name>
@@ -443,6 +453,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Idle cleaning Workers</name>
@@ -485,6 +496,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Idle Workers</name>
@@ -527,6 +539,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Keep Alive</name>
@@ -569,6 +582,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Logging</name>
@@ -611,6 +625,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Reading Request</name>
@@ -653,6 +668,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Requests / Second</name>
@@ -695,6 +711,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Sending Reply</name>
@@ -737,6 +754,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Starting Up</name>
@@ -779,6 +797,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Total Accesses</name>
@@ -821,6 +840,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Total KBytes</name>
@@ -863,6 +883,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Uptime</name>
@@ -905,6 +926,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Waiting</name>
@@ -947,6 +969,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
             </items>
             <discovery_rules/>
@@ -977,6 +1000,7 @@
                                 <name>Apache connections</name>
                                 <host>Apache Stats</host>
                             </resource>
+                            <max_columns>3</max_columns>
                             <application/>
                         </screen_item>
                         <screen_item>
@@ -998,6 +1022,7 @@
                                 <name>Apache workers</name>
                                 <host>Apache Stats</host>
                             </resource>
+                            <max_columns>3</max_columns>
                             <application/>
                         </screen_item>
                         <screen_item>
@@ -1019,6 +1044,7 @@
                                 <key>apache[Uptime]</key>
                                 <host>Apache Stats</host>
                             </resource>
+                            <max_columns>3</max_columns>
                             <application/>
                         </screen_item>
                     </screen_items>
@@ -1058,39 +1084,39 @@
             <ymax_item_1>0</ymax_item_1>
             <graph_items>
                 <graph_item>
-                    <sortorder>0</sortorder>
+                    <sortorder>4</sortorder>
                     <drawtype>0</drawtype>
-                    <color>C80000</color>
+                    <color>C8C800</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>Apache Stats</host>
-                        <key>apache[c_closing]</key>
+                        <key>apache[c_keep]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>1</sortorder>
+                    <sortorder>7</sortorder>
                     <drawtype>0</drawtype>
-                    <color>00C800</color>
+                    <color>009600</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>Apache Stats</host>
-                        <key>apache[c_dns]</key>
+                        <key>apache[c_send]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>2</sortorder>
+                    <sortorder>0</sortorder>
                     <drawtype>0</drawtype>
-                    <color>0000C8</color>
+                    <color>C80000</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>Apache Stats</host>
-                        <key>apache[c_finish]</key>
+                        <key>apache[c_closing]</key>
                     </item>
                 </graph_item>
                 <graph_item>
@@ -1106,75 +1132,75 @@
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>4</sortorder>
+                    <sortorder>8</sortorder>
                     <drawtype>0</drawtype>
-                    <color>C8C800</color>
+                    <color>000096</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>Apache Stats</host>
-                        <key>apache[c_keep]</key>
+                        <key>apache[c_start]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>5</sortorder>
+                    <sortorder>9</sortorder>
                     <drawtype>0</drawtype>
-                    <color>C8C8C8</color>
+                    <color>888888</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>Apache Stats</host>
-                        <key>apache[c_log]</key>
+                        <key>apache[c_waiting]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>6</sortorder>
+                    <sortorder>2</sortorder>
                     <drawtype>0</drawtype>
-                    <color>960000</color>
+                    <color>0000C8</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>Apache Stats</host>
-                        <key>apache[c_read]</key>
+                        <key>apache[c_finish]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>7</sortorder>
+                    <sortorder>1</sortorder>
                     <drawtype>0</drawtype>
-                    <color>009600</color>
+                    <color>00C800</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>Apache Stats</host>
-                        <key>apache[c_send]</key>
+                        <key>apache[c_dns]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>8</sortorder>
+                    <sortorder>5</sortorder>
                     <drawtype>0</drawtype>
-                    <color>000096</color>
+                    <color>C8C8C8</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>Apache Stats</host>
-                        <key>apache[c_start]</key>
+                        <key>apache[c_log]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>9</sortorder>
+                    <sortorder>6</sortorder>
                     <drawtype>0</drawtype>
-                    <color>888888</color>
+                    <color>960000</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>Apache Stats</host>
-                        <key>apache[c_waiting]</key>
+                        <key>apache[c_read]</key>
                     </item>
                 </graph_item>
             </graph_items>
@@ -1274,27 +1300,27 @@
             <ymax_item_1>0</ymax_item_1>
             <graph_items>
                 <graph_item>
-                    <sortorder>0</sortorder>
+                    <sortorder>1</sortorder>
                     <drawtype>0</drawtype>
-                    <color>C80000</color>
+                    <color>00C800</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>7</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>Apache Stats</host>
-                        <key>apache[BusyWorkers]</key>
+                        <key>apache[IdleWorkers]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>1</sortorder>
+                    <sortorder>0</sortorder>
                     <drawtype>0</drawtype>
-                    <color>00C800</color>
+                    <color>C80000</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>7</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>Apache Stats</host>
-                        <key>apache[IdleWorkers]</key>
+                        <key>apache[BusyWorkers]</key>
                     </item>
                 </graph_item>
             </graph_items>

data/zabbix-templates/cpu_tpl.xml

@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>2.0</version>
-    <date>2014-01-02T03:31:53Z</date>
+    <date>2015-01-17T21:06:25Z</date>
     <groups>
         <group>
-            <name>3. Service Ubuntu</name>
+            <name>3. debian</name>
         </group>
     </groups>
     <templates>
         <template>
             <template>CPU zrc</template>
             <name>CPU (zrc)</name>
+            <description/>
             <groups>
                 <group>
-                    <name>3. Service Ubuntu</name>
+                    <name>3. debian</name>
                 </group>
             </groups>
             <applications>
@@ -63,6 +64,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU guest %</name>
@@ -88,7 +90,7 @@
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex/>
-                    <params>100 * last(&quot;cpu[guest]&quot;,0) / last(&quot;cpu[total]&quot;,0)</params>
+                    <params>100*last(&quot;cpu[guest]&quot;)/last(&quot;cpu[total]&quot;)</params>
                     <ipmi_sensor/>
                     <data_type>0</data_type>
                     <authtype>0</authtype>
@@ -105,6 +107,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU idle</name>
@@ -147,6 +150,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU idle %</name>
@@ -172,7 +176,7 @@
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex/>
-                    <params>100 * last(&quot;cpu[idle]&quot;,0) / last(&quot;cpu[total]&quot;,0)</params>
+                    <params>100*last(&quot;cpu[idle]&quot;)/last(&quot;cpu[total]&quot;)</params>
                     <ipmi_sensor/>
                     <data_type>0</data_type>
                     <authtype>0</authtype>
@@ -189,6 +193,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU iowait</name>
@@ -231,6 +236,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU iowait %</name>
@@ -256,7 +262,7 @@
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex/>
-                    <params>100 * last(&quot;cpu[iowait]&quot;,0) / last(&quot;cpu[total]&quot;,0)</params>
+                    <params>100*last(&quot;cpu[iowait]&quot;)/last(&quot;cpu[total]&quot;)</params>
                     <ipmi_sensor/>
                     <data_type>0</data_type>
                     <authtype>0</authtype>
@@ -273,6 +279,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU irq</name>
@@ -315,6 +322,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU irq %</name>
@@ -340,7 +348,7 @@
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex/>
-                    <params>100 * last(&quot;cpu[irq]&quot;,0) / last(&quot;cpu[total]&quot;,0)</params>
+                    <params>100*last(&quot;cpu[irq]&quot;)/last(&quot;cpu[total]&quot;)</params>
                     <ipmi_sensor/>
                     <data_type>0</data_type>
                     <authtype>0</authtype>
@@ -357,6 +365,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU nice</name>
@@ -399,6 +408,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU nice %</name>
@@ -424,7 +434,7 @@
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex/>
-                    <params>100 * last(&quot;cpu[nice]&quot;,0) / last(&quot;cpu[total]&quot;,0)</params>
+                    <params>100*last(&quot;cpu[nice]&quot;)/last(&quot;cpu[total]&quot;)</params>
                     <ipmi_sensor/>
                     <data_type>0</data_type>
                     <authtype>0</authtype>
@@ -441,6 +451,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU soft</name>
@@ -483,6 +494,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU soft %</name>
@@ -508,7 +520,7 @@
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex/>
-                    <params>100 * last(&quot;cpu[soft]&quot;,0) / last(&quot;cpu[total]&quot;,0)</params>
+                    <params>100*last(&quot;cpu[soft]&quot;)/last(&quot;cpu[total]&quot;)</params>
                     <ipmi_sensor/>
                     <data_type>0</data_type>
                     <authtype>0</authtype>
@@ -525,6 +537,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU steal</name>
@@ -567,6 +580,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU steal %</name>
@@ -592,7 +606,7 @@
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex/>
-                    <params>100 * last(&quot;cpu[steal]&quot;,0) / last(&quot;cpu[total]&quot;,0)</params>
+                    <params>100*last(&quot;cpu[steal]&quot;)/last(&quot;cpu[total]&quot;)</params>
                     <ipmi_sensor/>
                     <data_type>0</data_type>
                     <authtype>0</authtype>
@@ -609,6 +623,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU system</name>
@@ -651,6 +666,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU system %</name>
@@ -676,7 +692,7 @@
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex/>
-                    <params>100 * last(&quot;cpu[system]&quot;,0) / last(&quot;cpu[total]&quot;,0)</params>
+                    <params>100*last(&quot;cpu[system]&quot;,0)/last(&quot;cpu[total]&quot;,0)</params>
                     <ipmi_sensor/>
                     <data_type>0</data_type>
                     <authtype>0</authtype>
@@ -693,6 +709,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU total</name>
@@ -735,6 +752,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU used</name>
@@ -777,6 +795,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU used %</name>
@@ -802,7 +821,7 @@
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex/>
-                    <params>100 * last(&quot;cpu[used]&quot;,0) / last(&quot;cpu[total]&quot;,0)</params>
+                    <params>100*last(&quot;cpu[used]&quot;)/last(&quot;cpu[total]&quot;)</params>
                     <ipmi_sensor/>
                     <data_type>0</data_type>
                     <authtype>0</authtype>
@@ -819,6 +838,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU user</name>
@@ -861,6 +881,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>CPU user %</name>
@@ -886,7 +907,7 @@
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex/>
-                    <params>100 * last(&quot;cpu[user]&quot;,0) / last(&quot;cpu[total]&quot;,0)</params>
+                    <params>100*last(&quot;cpu[user]&quot;)/last(&quot;cpu[total]&quot;)</params>
                     <ipmi_sensor/>
                     <data_type>0</data_type>
                     <authtype>0</authtype>
@@ -903,6 +924,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
             </items>
             <discovery_rules/>
@@ -958,99 +980,99 @@
             <ymax_item_1>0</ymax_item_1>
             <graph_items>
                 <graph_item>
-                    <sortorder>0</sortorder>
+                    <sortorder>3</sortorder>
                     <drawtype>0</drawtype>
-                    <color>23AA10</color>
+                    <color>BC5000</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>CPU zrc</host>
-                        <key>cpu[user_percent]</key>
+                        <key>cpu[steal_percent]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>1</sortorder>
+                    <sortorder>5</sortorder>
                     <drawtype>0</drawtype>
-                    <color>1023AA</color>
+                    <color>53A3D3</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>CPU zrc</host>
-                        <key>cpu[system_percent]</key>
+                        <key>cpu[iowait_percent]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>2</sortorder>
+                    <sortorder>6</sortorder>
                     <drawtype>0</drawtype>
-                    <color>6699AA</color>
+                    <color>938320</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>CPU zrc</host>
-                        <key>cpu[nice_percent]</key>
+                        <key>cpu[irq_percent]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>3</sortorder>
+                    <sortorder>4</sortorder>
                     <drawtype>0</drawtype>
-                    <color>BC5000</color>
+                    <color>D3D300</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>CPU zrc</host>
-                        <key>cpu[steal_percent]</key>
+                        <key>cpu[guest_percent]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>4</sortorder>
+                    <sortorder>0</sortorder>
                     <drawtype>0</drawtype>
-                    <color>D3D300</color>
+                    <color>23AA10</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>CPU zrc</host>
-                        <key>cpu[guest_percent]</key>
+                        <key>cpu[user_percent]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>5</sortorder>
+                    <sortorder>2</sortorder>
                     <drawtype>0</drawtype>
-                    <color>53A3D3</color>
+                    <color>6699AA</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>CPU zrc</host>
-                        <key>cpu[iowait_percent]</key>
+                        <key>cpu[nice_percent]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>6</sortorder>
+                    <sortorder>7</sortorder>
                     <drawtype>0</drawtype>
-                    <color>938320</color>
+                    <color>53D3A3</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>CPU zrc</host>
-                        <key>cpu[irq_percent]</key>
+                        <key>cpu[soft_percent]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>7</sortorder>
+                    <sortorder>1</sortorder>
                     <drawtype>0</drawtype>
-                    <color>53D3A3</color>
+                    <color>1023AA</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>CPU zrc</host>
-                        <key>cpu[soft_percent]</key>
+                        <key>cpu[system_percent]</key>
                     </item>
                 </graph_item>
             </graph_items>
@@ -1106,99 +1128,99 @@
             <ymax_item_1>0</ymax_item_1>
             <graph_items>
                 <graph_item>
-                    <sortorder>0</sortorder>
+                    <sortorder>2</sortorder>
                     <drawtype>0</drawtype>
-                    <color>23AA10</color>
+                    <color>6699AA</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>CPU zrc</host>
-                        <key>cpu[user_percent]</key>
+                        <key>cpu[nice_percent]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>2</sortorder>
+                    <sortorder>5</sortorder>
                     <drawtype>0</drawtype>
-                    <color>6699AA</color>
+                    <color>53A3D3</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>CPU zrc</host>
-                        <key>cpu[nice_percent]</key>
+                        <key>cpu[iowait_percent]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>1</sortorder>
+                    <sortorder>6</sortorder>
                     <drawtype>0</drawtype>
-                    <color>1023AA</color>
+                    <color>938320</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>CPU zrc</host>
-                        <key>cpu[system_percent]</key>
+                        <key>cpu[irq_percent]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>3</sortorder>
+                    <sortorder>4</sortorder>
                     <drawtype>0</drawtype>
-                    <color>BC5000</color>
+                    <color>D3D300</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>CPU zrc</host>
-                        <key>cpu[steal_percent]</key>
+                        <key>cpu[guest_percent]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>4</sortorder>
+                    <sortorder>7</sortorder>
                     <drawtype>0</drawtype>
-                    <color>D3D300</color>
+                    <color>53D3A3</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>CPU zrc</host>
-                        <key>cpu[guest_percent]</key>
+                        <key>cpu[soft_percent]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>5</sortorder>
+                    <sortorder>3</sortorder>
                     <drawtype>0</drawtype>
-                    <color>53A3D3</color>
+                    <color>BC5000</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>CPU zrc</host>
-                        <key>cpu[iowait_percent]</key>
+                        <key>cpu[steal_percent]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>6</sortorder>
+                    <sortorder>1</sortorder>
                     <drawtype>0</drawtype>
-                    <color>938320</color>
+                    <color>1023AA</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>CPU zrc</host>
-                        <key>cpu[irq_percent]</key>
+                        <key>cpu[system_percent]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>7</sortorder>
+                    <sortorder>0</sortorder>
                     <drawtype>0</drawtype>
-                    <color>53D3A3</color>
+                    <color>23AA10</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>CPU zrc</host>
-                        <key>cpu[soft_percent]</key>
+                        <key>cpu[user_percent]</key>
                     </item>
                 </graph_item>
             </graph_items>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zabbix-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -108,6 +108,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile-packaging
 - Gemfile.lock
 - LICENSE.txt
 - README.md
@@ -138,6 +139,10 @@ files:
 - lib/zabbix-ruby-client/runner.rb
 - lib/zabbix-ruby-client/store.rb
 - lib/zabbix-ruby-client/version.rb
+- packaging/Gemfile
+- packaging/Gemfile.lock
+- packaging/bundler-config
+- packaging/run.sh
 - spec/files/config.yml
 - spec/files/data/.gitkeep
 - spec/files/logs/.gitkeep
@@ -218,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: This tool is intended to use zabbix sender to propagate monitoring data for