zabbix-ruby-client 0.1.1 → 0.1.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (20) hide show
  1. checksums.yaml +4 -4
  2. data/.coveralls.yml +1 -1
  3. data/.gitignore +3 -0
  4. data/CHANGELOG.md +6 -0
  5. data/Gemfile-packaging +3 -0
  6. data/Gemfile.lock +1 -1
  7. data/README.md +16 -6
  8. data/Rakefile +88 -5
  9. data/lib/zabbix-ruby-client/plugins/network.rb +1 -1
  10. data/lib/zabbix-ruby-client/plugins/sysinfo.rb +4 -4
  11. data/lib/zabbix-ruby-client/runner.rb +1 -1
  12. data/lib/zabbix-ruby-client/version.rb +1 -1
  13. data/packaging/Gemfile +3 -0
  14. data/packaging/Gemfile.lock +10 -0
  15. data/packaging/bundler-config +3 -0
  16. data/packaging/run.sh +12 -0
  17. data/spec/lib/data_spec.rb +1 -0
  18. data/zabbix-templates/apache_tpl.xml +63 -37
  19. data/zabbix-templates/cpu_tpl.xml +83 -61
  20. metadata +8 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 19e7e397ae47c0fdb6dd18955e819231db4f3c76
4
- data.tar.gz: 48ddc4da7f27c201f00462dfdd97e54a1d41fca9
3
+ metadata.gz: f6ca5d569fa5a14fcd429f4a4715dbf40dd59c0a
4
+ data.tar.gz: e923105d8540ebea6479448c03d434c6075fa7b7
5
5
  SHA512:
6
- metadata.gz: 05d85cb4bfea25f1ee9e8e9cdc2f227776541af4daa38883e72c73ae55135a5cd25434d8b035399eae5f8370fb086fe63af91c12f7f27dd465c15147b33ddb7d
7
- data.tar.gz: deac2a1dbc3eefc397a77ce15baba5287f67d7908c14353b209356159aa515671bbc1fdff496708beb0af1d8d97b9d9607a73eda2e06ed7173e62024dc0eaff3
6
+ metadata.gz: f596cc9dee5ab9ccf630e82c77b7644dc247bea00a42ed3db8d0b680fba98dd01b573cda616a3217d444770ef31d462a8567bd22fe41576663cdab4f98f10698
7
+ data.tar.gz: 4849799d77077d96ff27385ceaaa1fd867106c7786f4057e5ac989af09945b97af881aeee74f1ddd1d13c0320b28bdff53fbf492985ce83693abf0da4ac61fd4
data/.coveralls.yml CHANGED
@@ -1 +1 @@
1
- repo_token: Oej1FGJWwMJdJPP5si37KoXFU3EcLQH9v
1
+ repo_token: uCejqmEVoAZ4LyEAvmDIBBA8yXG7WTDaO
data/.gitignore CHANGED
@@ -13,3 +13,6 @@ test/version_tmp
13
13
  tmp
14
14
  .settings
15
15
  vendor/ruby
16
+ zrc-*
17
+ packaging/traveling-*
18
+ packaging/vendor/
data/CHANGELOG.md CHANGED
@@ -1,6 +1,12 @@
1
1
  Zabbbix Ruby Client Changelog
2
2
  -----------------------------
3
3
 
4
+ ### v0.1.2 - 2015-01-26
5
+ - compat with zabbix_sender 2.4 (temporary fix, requires more investigation)
6
+ - fix cpu and apache zabbix templates for zabbix 2.4
7
+ - make sysinfo plugin work on debian wheezy
8
+ - add a packaging script based on flying ruby
9
+
4
10
  ### v0.1.1 - 2014-08-28
5
11
  - add link to the chef cookbook
6
12
  - better backtrace error in case a plugin crashes
data/Gemfile-packaging ADDED
@@ -0,0 +1,3 @@
1
+ source 'https://rubygems.org'
2
+
3
+ gem "thor"
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- zabbix-ruby-client (0.1.1)
4
+ zabbix-ruby-client (0.1.2)
5
5
  thor
6
6
 
7
7
  GEM
data/README.md CHANGED
@@ -3,10 +3,10 @@ Zabbix Ruby Client
3
3
 
4
4
  [![Gem Version](http://img.shields.io/gem/v/zabbix-ruby-client.svg)](http://rubygems.org/gems/zabbix-ruby-client)
5
5
  [![Downloads](http://img.shields.io/gem/dt/zabbix-ruby-client.svg)](https://rubygems.org/gems/zabbix-ruby-client)
6
- [![Build Status](http://img.shields.io/travis/eduvo/zabbix-ruby-client.svg)](https://travis-ci.org/eduvo/zabbix-ruby-client)
7
- [![Coverage Status](http://img.shields.io/coveralls/eduvo/zabbix-ruby-client.svg)](https://coveralls.io/r/eduvo/zabbix-ruby-client?branch=master)
8
- [![Dependency Status](https://gemnasium.com/eduvo/zabbix-ruby-client.png)](https://gemnasium.com/eduvo/zabbix-ruby-client)
9
- [![Code Climate](http://img.shields.io/codeclimate/github/eduvo/zabbix-ruby-client.svg)](https://codeclimate.com/github/eduvo/zabbix-ruby-client)
6
+ [![Build Status](http://img.shields.io/travis/mose/zabbix-ruby-client.svg)](https://travis-ci.org/mose/zabbix-ruby-client)
7
+ [![Coverage Status](http://img.shields.io/coveralls/mose/zabbix-ruby-client.svg)](https://coveralls.io/r/mose/zabbix-ruby-client?branch=master)
8
+ [![Dependency Status](https://gemnasium.com/mose/zabbix-ruby-client.png)](https://gemnasium.com/mose/zabbix-ruby-client)
9
+ [![Code Climate](http://img.shields.io/codeclimate/github/mose/zabbix-ruby-client.svg)](https://codeclimate.com/github/mose/zabbix-ruby-client)
10
10
 
11
11
  ----
12
12
 
@@ -86,7 +86,7 @@ Here is an example setup using the files generated by the init:
86
86
 
87
87
  There are a set of standart plugins included in the package, aimed at linux systems.
88
88
 
89
- * **ubuntu** system stats ([system_tpl](master/zabbix-templates/system_tpl.xml) includes the following)
89
+ * **debian/ubuntu** system stats ([system_tpl](master/zabbix-templates/system_tpl.xml) includes the following)
90
90
  * **load** (uses /proc/loadavg) [load_tpl](master/zabbix-templates/load_tpl.xml)
91
91
  * **cpu** (uses /proc/stat) [cpu_tpl](master/zabbix-templates/cpu_tpl.xml)
92
92
  * **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
95
95
  * **network** (uses /proc/net/dev) [network_tpl](master/zabbix-templates/network_tpl.xml)
96
96
  * args [ eth0 ] is just the interface identifier
97
97
  * **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)
98
+ * for debian, `apt-get install update-notifier-common`
98
99
  * **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)
99
100
  * **apache** (depends on mod_status with status_extended on) [apache_tpl](master/zabbix-templates/apache_tpl.xml)
100
101
  * **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
230
231
  ListenIP 127.0.0.1
231
232
  ```
232
233
 
234
+ ## Standalone packaging
235
+
236
+ From the source repository it's possible to build a tarball directly usable on any server, without the need to install ruby on it.
237
+
238
+ rake package:linux:x86
239
+
240
+ Available arch are x86, x86_64 and osx (provided by flying ruby toolkit).
241
+
242
+
233
243
  ## Todo
234
244
 
235
245
  * publish a chef cookbook for system wide installation
@@ -261,4 +271,4 @@ ListenIP 127.0.0.1
261
271
 
262
272
  ## License
263
273
 
264
- Copyright 2013 [Faria Systems](http://faria.co) - MIT license - created by mose at mose.com
274
+ Copyright 2013-2014 [Faria Systems](http://faria.co) - MIT license - created by mose at mose.com
data/Rakefile CHANGED
@@ -1,9 +1,11 @@
1
1
  #!/usr/bin/env rake
2
- # begin
3
- # require 'bundler/setup'
4
- # rescue LoadError
5
- # puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
6
- # end
2
+
3
+ begin
4
+ require 'bundler/setup'
5
+ rescue LoadError
6
+ puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
7
+ end
8
+
7
9
  require "bundler/gem_tasks"
8
10
  require "rake/testtask"
9
11
  require "rspec/core/rake_task" # RSpec 2.0
@@ -17,3 +19,84 @@ task :spec do
17
19
  end
18
20
 
19
21
  task :default => :spec
22
+
23
+ PACKAGE_NAME = "zrc"
24
+ VERSION = "0.1.2"
25
+ TRAVELING_RUBY_VERSION = "20141215-2.1.5"
26
+
27
+ desc "Package your app"
28
+ task :package => ['package:linux:x86', 'package:linux:x86_64', 'package:osx']
29
+
30
+ namespace :package do
31
+ namespace :linux do
32
+ desc "Package your app for Linux x86"
33
+ task :x86 => [:bundle_install, "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86.tar.gz"] do
34
+ create_package("linux-x86")
35
+ end
36
+
37
+ desc "Package your app for Linux x86_64"
38
+ task :x86_64 => [:bundle_install, "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz"] do
39
+ create_package("linux-x86_64")
40
+ end
41
+ end
42
+
43
+ desc "Package your app for OS X"
44
+ task :osx => [:bundle_install, "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz"] do
45
+ create_package("osx")
46
+ end
47
+
48
+ desc "Install gems to local directory"
49
+ task :bundle_install do
50
+ if RUBY_VERSION !~ /^2\.1\./
51
+ abort "You can only 'bundle install' using Ruby 2.1, because that's what Traveling Ruby uses."
52
+ end
53
+ sh "rm -rf packaging/tmp"
54
+ sh "mkdir packaging/tmp"
55
+ sh "cp Gemfile-packaging packaging/tmp/Gemfile"
56
+ Bundler.with_clean_env do
57
+ sh "cd packaging/tmp && env BUNDLE_IGNORE_CONFIG=1 bundle install --path ../vendor --without development"
58
+ end
59
+ sh "cp packaging/tmp/Gemfile packaging/tmp/Gemfile.lock packaging"
60
+ sh "rm -rf packaging/tmp"
61
+ sh "rm -f packaging/vendor/*/*/cache/*"
62
+ end
63
+ end
64
+
65
+ file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86.tar.gz" do
66
+ download_runtime("linux-x86")
67
+ end
68
+
69
+ file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz" do
70
+ download_runtime("linux-x86_64")
71
+ end
72
+
73
+ file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz" do
74
+ download_runtime("osx")
75
+ end
76
+
77
+ def create_package(target)
78
+ package_dir = "#{PACKAGE_NAME}-#{VERSION}-#{target}"
79
+ sh "rm -rf #{package_dir}"
80
+ sh "mkdir #{package_dir}"
81
+ sh "mkdir #{package_dir}/config-sample"
82
+ sh "mkdir -p #{package_dir}/lib/app"
83
+ sh "cp bin/zrc #{package_dir}/lib/app/"
84
+ sh "cp -r lib #{package_dir}/lib/app/lib"
85
+ sh "cp -r templates/client/*.yml #{package_dir}/config-sample"
86
+ sh "mkdir #{package_dir}/lib/ruby"
87
+ sh "tar -xzf packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}.tar.gz -C #{package_dir}/lib/ruby"
88
+ sh "cp packaging/run.sh #{package_dir}/zrc"
89
+ sh "cp -pR packaging/vendor #{package_dir}/lib/"
90
+ sh "cp packaging/Gemfile packaging/Gemfile.lock #{package_dir}/lib/vendor/"
91
+ sh "mkdir #{package_dir}/lib/vendor/.bundle"
92
+ sh "cp packaging/bundler-config #{package_dir}/lib/vendor/.bundle/config"
93
+ if !ENV['DIR_ONLY']
94
+ sh "tar -czf #{package_dir}.tar.gz #{package_dir}"
95
+ sh "rm -rf #{package_dir}"
96
+ end
97
+ end
98
+
99
+ def download_runtime(target)
100
+ sh "cd packaging && curl -L -O --fail " +
101
+ "http://d6r77u77i8pq3.cloudfront.net/releases/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}.tar.gz"
102
+ end
data/lib/zabbix-ruby-client/plugins/network.rb CHANGED
@@ -36,7 +36,7 @@ module ZabbixRubyClient
36
36
  private
37
37
 
38
38
  def get_info(interface)
39
- info = getline("/proc/net/dev", "#{interface}: ")
39
+ info = getline("/proc/net/dev", "#{interface}:")
40
40
  if info
41
41
  info.split(/\s+/)
42
42
  else
data/lib/zabbix-ruby-client/plugins/sysinfo.rb CHANGED
@@ -9,8 +9,8 @@ module ZabbixRubyClient
9
9
  host = args.delete_at(0)
10
10
  uname = `uname -a`
11
11
  if $?.to_i == 0
12
- arch, hostname, kernel, kernel_version, machine, proc,
13
- _, _, _, _, _, _, _, platform, os = uname.split(/ /)
12
+ arch, hostname, kernel, kernel_version, machine, os_debian,
13
+ _, platform_debian, _, _, _, _, _, platform, os = uname.split(/ /)
14
14
  else
15
15
  Log.warn "Are you running on ubuntu ?"
16
16
  return []
@@ -23,8 +23,8 @@ module ZabbixRubyClient
23
23
  back << "#{host} sysinfo[kernel] #{time} #{kernel}"
24
24
  back << "#{host} sysinfo[kernel_version] #{time} #{kernel_version}"
25
25
  back << "#{host} sysinfo[machine] #{time} #{machine}"
26
- back << "#{host} sysinfo[platform] #{time} #{platform}"
27
- back << "#{host} sysinfo[os] #{time} #{os}"
26
+ back << "#{host} sysinfo[platform] #{time} #{platform || platform_debian}"
27
+ back << "#{host} sysinfo[os] #{time} #{os || os_debian}"
28
28
  Hash[*args].each do |k,v|
29
29
  back << "#{host} sysinfo[#{k}] #{time} #{v}"
30
30
  end
data/lib/zabbix-ruby-client/runner.rb CHANGED
@@ -23,7 +23,7 @@ module ZabbixRubyClient
23
23
  ZabbixRubyClient::Plugins.scan_dirs([ PLUGINDIR ] + @config['plugindirs'])
24
24
  ZabbixRubyClient::Log.set_logger(File.join(@logsdir, 'zrc.log'), @config['loglevel'])
25
25
  ZabbixRubyClient::Log.debug @config.inspect
26
- @is_22 = /v2\.2\./.match zabbix_sender_version
26
+ @is_22 = /v2\.[24]\./.match zabbix_sender_version
27
27
  ZabbixRubyClient::Log.debug "zabbix sender version #{zabbix_sender_version}"
28
28
  end
29
29
 
data/lib/zabbix-ruby-client/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ZabbixRubyClient
2
- VERSION ||= "0.1.1"
2
+ VERSION ||= "0.1.2"
3
3
  end
data/packaging/Gemfile ADDED
@@ -0,0 +1,3 @@
1
+ source 'https://rubygems.org'
2
+
3
+ gem "thor"
data/packaging/Gemfile.lock ADDED
@@ -0,0 +1,10 @@
1
+ GEM
2
+ remote: https://rubygems.org/
3
+ specs:
4
+ thor (0.19.1)
5
+
6
+ PLATFORMS
7
+ ruby
8
+
9
+ DEPENDENCIES
10
+ thor
data/packaging/bundler-config ADDED
@@ -0,0 +1,3 @@
1
+ BUNDLE_PATH: .
2
+ BUNDLE_WITHOUT: development
3
+ BUNDLE_DISABLE_SHARED_GEMS: '1'
data/packaging/run.sh ADDED
@@ -0,0 +1,12 @@
1
+ #!/bin/bash
2
+ set -e
3
+
4
+ # Figure out where this script is located.
5
+ SELFDIR="`dirname \"$0\"`"
6
+ SELFDIR="`cd \"$SELFDIR\" && pwd`"
7
+
8
+ export BUNDLE_GEMFILE="$SELFDIR/lib/vendor/Gemfile"
9
+ unset BUNDLE_IGNORE_CONFIG
10
+
11
+ # Run the actual app using the bundled Ruby interpreter.
12
+ exec "$SELFDIR/lib/ruby/bin/ruby" -rbundler/setup -I$SELFDIR/lib/app/lib "$SELFDIR/lib/app/zrc" $@
data/spec/lib/data_spec.rb CHANGED
@@ -50,6 +50,7 @@ describe ZabbixRubyClient::Data do
50
50
  it "logs buggy plugins" do
51
51
  allow(ZabbixRubyClient::Log).to receive(:fatal).with("Oops")
52
52
  allow(ZabbixRubyClient::Log).to receive(:fatal).with("Exception")
53
+ allow(ZabbixRubyClient::Log).to receive(:fatal)
53
54
  @data.run_plugin("sample_buggy")
54
55
  end
55
56
 
data/zabbix-templates/apache_tpl.xml CHANGED
@@ -1,19 +1,20 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <zabbix_export>
3
3
  <version>2.0</version>
4
- <date>2014-01-02T03:31:10Z</date>
4
+ <date>2015-01-17T21:09:42Z</date>
5
5
  <groups>
6
6
  <group>
7
- <name>3. Service Apache</name>
7
+ <name>3. apache</name>
8
8
  </group>
9
9
  </groups>
10
10
  <templates>
11
11
  <template>
12
12
  <template>Apache Stats</template>
13
13
  <name>Apache (zrc)</name>
14
+ <description/>
14
15
  <groups>
15
16
  <group>
16
- <name>3. Service Apache</name>
17
+ <name>3. apache</name>
17
18
  </group>
18
19
  </groups>
19
20
  <applications>
@@ -63,6 +64,7 @@
63
64
  </application>
64
65
  </applications>
65
66
  <valuemap/>
67
+ <logtimefmt/>
66
68
  </item>
67
69
  <item>
68
70
  <name>Bytes / Request</name>
@@ -105,6 +107,7 @@
105
107
  </application>
106
108
  </applications>
107
109
  <valuemap/>
110
+ <logtimefmt/>
108
111
  </item>
109
112
  <item>
110
113
  <name>Bytes / Seconds</name>
@@ -147,6 +150,7 @@
147
150
  </application>
148
151
  </applications>
149
152
  <valuemap/>
153
+ <logtimefmt/>
150
154
  </item>
151
155
  <item>
152
156
  <name>Closing Connection.</name>
@@ -189,6 +193,7 @@
189
193
  </application>
190
194
  </applications>
191
195
  <valuemap/>
196
+ <logtimefmt/>
192
197
  </item>
193
198
  <item>
194
199
  <name>CPU Load</name>
@@ -231,6 +236,7 @@
231
236
  </application>
232
237
  </applications>
233
238
  <valuemap/>
239
+ <logtimefmt/>
234
240
  </item>
235
241
  <item>
236
242
  <name>DNS Lookup</name>
@@ -273,6 +279,7 @@
273
279
  </application>
274
280
  </applications>
275
281
  <valuemap/>
282
+ <logtimefmt/>
276
283
  </item>
277
284
  <item>
278
285
  <name>Free workers</name>
@@ -298,7 +305,7 @@
298
305
  <snmpv3_privpassphrase/>
299
306
  <formula>1</formula>
300
307
  <delay_flex/>
301
- <params>100*last(&quot;apache[IdleWorkers]&quot;)/(last(&quot;apache[BusyWorkers]&quot;) + last(&quot;apache[IdleWorkers]&quot;))</params>
308
+ <params>100*last(&quot;apache[IdleWorkers]&quot;)/(last(&quot;apache[BusyWorkers]&quot;)+last(&quot;apache[IdleWorkers]&quot;))</params>
302
309
  <ipmi_sensor/>
303
310
  <data_type>0</data_type>
304
311
  <authtype>0</authtype>
@@ -315,6 +322,7 @@
315
322
  </application>
316
323
  </applications>
317
324
  <valuemap/>
325
+ <logtimefmt/>
318
326
  </item>
319
327
  <item>
320
328
  <name>Gracefully Finishing</name>
@@ -357,6 +365,7 @@
357
365
  </application>
358
366
  </applications>
359
367
  <valuemap/>
368
+ <logtimefmt/>
360
369
  </item>
361
370
  <item>
362
371
  <name>HTTP Check</name>
@@ -401,6 +410,7 @@
401
410
  <valuemap>
402
411
  <name>Service state</name>
403
412
  </valuemap>
413
+ <logtimefmt/>
404
414
  </item>
405
415
  <item>
406
416
  <name>Idle</name>
@@ -443,6 +453,7 @@
443
453
  </application>
444
454
  </applications>
445
455
  <valuemap/>
456
+ <logtimefmt/>
446
457
  </item>
447
458
  <item>
448
459
  <name>Idle cleaning Workers</name>
@@ -485,6 +496,7 @@
485
496
  </application>
486
497
  </applications>
487
498
  <valuemap/>
499
+ <logtimefmt/>
488
500
  </item>
489
501
  <item>
490
502
  <name>Idle Workers</name>
@@ -527,6 +539,7 @@
527
539
  </application>
528
540
  </applications>
529
541
  <valuemap/>
542
+ <logtimefmt/>
530
543
  </item>
531
544
  <item>
532
545
  <name>Keep Alive</name>
@@ -569,6 +582,7 @@
569
582
  </application>
570
583
  </applications>
571
584
  <valuemap/>
585
+ <logtimefmt/>
572
586
  </item>
573
587
  <item>
574
588
  <name>Logging</name>
@@ -611,6 +625,7 @@
611
625
  </application>
612
626
  </applications>
613
627
  <valuemap/>
628
+ <logtimefmt/>
614
629
  </item>
615
630
  <item>
616
631
  <name>Reading Request</name>
@@ -653,6 +668,7 @@
653
668
  </application>
654
669
  </applications>
655
670
  <valuemap/>
671
+ <logtimefmt/>
656
672
  </item>
657
673
  <item>
658
674
  <name>Requests / Second</name>
@@ -695,6 +711,7 @@
695
711
  </application>
696
712
  </applications>
697
713
  <valuemap/>
714
+ <logtimefmt/>
698
715
  </item>
699
716
  <item>
700
717
  <name>Sending Reply</name>
@@ -737,6 +754,7 @@
737
754
  </application>
738
755
  </applications>
739
756
  <valuemap/>
757
+ <logtimefmt/>
740
758
  </item>
741
759
  <item>
742
760
  <name>Starting Up</name>
@@ -779,6 +797,7 @@
779
797
  </application>
780
798
  </applications>
781
799
  <valuemap/>
800
+ <logtimefmt/>
782
801
  </item>
783
802
  <item>
784
803
  <name>Total Accesses</name>
@@ -821,6 +840,7 @@
821
840
  </application>
822
841
  </applications>
823
842
  <valuemap/>
843
+ <logtimefmt/>
824
844
  </item>
825
845
  <item>
826
846
  <name>Total KBytes</name>
@@ -863,6 +883,7 @@
863
883
  </application>
864
884
  </applications>
865
885
  <valuemap/>
886
+ <logtimefmt/>
866
887
  </item>
867
888
  <item>
868
889
  <name>Uptime</name>
@@ -905,6 +926,7 @@
905
926
  </application>
906
927
  </applications>
907
928
  <valuemap/>
929
+ <logtimefmt/>
908
930
  </item>
909
931
  <item>
910
932
  <name>Waiting</name>
@@ -947,6 +969,7 @@
947
969
  </application>
948
970
  </applications>
949
971
  <valuemap/>
972
+ <logtimefmt/>
950
973
  </item>
951
974
  </items>
952
975
  <discovery_rules/>
@@ -977,6 +1000,7 @@
977
1000
  <name>Apache connections</name>
978
1001
  <host>Apache Stats</host>
979
1002
  </resource>
1003
+ <max_columns>3</max_columns>
980
1004
  <application/>
981
1005
  </screen_item>
982
1006
  <screen_item>
@@ -998,6 +1022,7 @@
998
1022
  <name>Apache workers</name>
999
1023
  <host>Apache Stats</host>
1000
1024
  </resource>
1025
+ <max_columns>3</max_columns>
1001
1026
  <application/>
1002
1027
  </screen_item>
1003
1028
  <screen_item>
@@ -1019,6 +1044,7 @@
1019
1044
  <key>apache[Uptime]</key>
1020
1045
  <host>Apache Stats</host>
1021
1046
  </resource>
1047
+ <max_columns>3</max_columns>
1022
1048
  <application/>
1023
1049
  </screen_item>
1024
1050
  </screen_items>
@@ -1058,39 +1084,39 @@
1058
1084
  <ymax_item_1>0</ymax_item_1>
1059
1085
  <graph_items>
1060
1086
  <graph_item>
1061
- <sortorder>0</sortorder>
1087
+ <sortorder>4</sortorder>
1062
1088
  <drawtype>0</drawtype>
1063
- <color>C80000</color>
1089
+ <color>C8C800</color>
1064
1090
  <yaxisside>0</yaxisside>
1065
1091
  <calc_fnc>2</calc_fnc>
1066
1092
  <type>0</type>
1067
1093
  <item>
1068
1094
  <host>Apache Stats</host>
1069
- <key>apache[c_closing]</key>
1095
+ <key>apache[c_keep]</key>
1070
1096
  </item>
1071
1097
  </graph_item>
1072
1098
  <graph_item>
1073
- <sortorder>1</sortorder>
1099
+ <sortorder>7</sortorder>
1074
1100
  <drawtype>0</drawtype>
1075
- <color>00C800</color>
1101
+ <color>009600</color>
1076
1102
  <yaxisside>0</yaxisside>
1077
1103
  <calc_fnc>2</calc_fnc>
1078
1104
  <type>0</type>
1079
1105
  <item>
1080
1106
  <host>Apache Stats</host>
1081
- <key>apache[c_dns]</key>
1107
+ <key>apache[c_send]</key>
1082
1108
  </item>
1083
1109
  </graph_item>
1084
1110
  <graph_item>
1085
- <sortorder>2</sortorder>
1111
+ <sortorder>0</sortorder>
1086
1112
  <drawtype>0</drawtype>
1087
- <color>0000C8</color>
1113
+ <color>C80000</color>
1088
1114
  <yaxisside>0</yaxisside>
1089
1115
  <calc_fnc>2</calc_fnc>
1090
1116
  <type>0</type>
1091
1117
  <item>
1092
1118
  <host>Apache Stats</host>
1093
- <key>apache[c_finish]</key>
1119
+ <key>apache[c_closing]</key>
1094
1120
  </item>
1095
1121
  </graph_item>
1096
1122
  <graph_item>
@@ -1106,75 +1132,75 @@
1106
1132
  </item>
1107
1133
  </graph_item>
1108
1134
  <graph_item>
1109
- <sortorder>4</sortorder>
1135
+ <sortorder>8</sortorder>
1110
1136
  <drawtype>0</drawtype>
1111
- <color>C8C800</color>
1137
+ <color>000096</color>
1112
1138
  <yaxisside>0</yaxisside>
1113
1139
  <calc_fnc>2</calc_fnc>
1114
1140
  <type>0</type>
1115
1141
  <item>
1116
1142
  <host>Apache Stats</host>
1117
- <key>apache[c_keep]</key>
1143
+ <key>apache[c_start]</key>
1118
1144
  </item>
1119
1145
  </graph_item>
1120
1146
  <graph_item>
1121
- <sortorder>5</sortorder>
1147
+ <sortorder>9</sortorder>
1122
1148
  <drawtype>0</drawtype>
1123
- <color>C8C8C8</color>
1149
+ <color>888888</color>
1124
1150
  <yaxisside>0</yaxisside>
1125
1151
  <calc_fnc>2</calc_fnc>
1126
1152
  <type>0</type>
1127
1153
  <item>
1128
1154
  <host>Apache Stats</host>
1129
- <key>apache[c_log]</key>
1155
+ <key>apache[c_waiting]</key>
1130
1156
  </item>
1131
1157
  </graph_item>
1132
1158
  <graph_item>
1133
- <sortorder>6</sortorder>
1159
+ <sortorder>2</sortorder>
1134
1160
  <drawtype>0</drawtype>
1135
- <color>960000</color>
1161
+ <color>0000C8</color>
1136
1162
  <yaxisside>0</yaxisside>
1137
1163
  <calc_fnc>2</calc_fnc>
1138
1164
  <type>0</type>
1139
1165
  <item>
1140
1166
  <host>Apache Stats</host>
1141
- <key>apache[c_read]</key>
1167
+ <key>apache[c_finish]</key>
1142
1168
  </item>
1143
1169
  </graph_item>
1144
1170
  <graph_item>
1145
- <sortorder>7</sortorder>
1171
+ <sortorder>1</sortorder>
1146
1172
  <drawtype>0</drawtype>
1147
- <color>009600</color>
1173
+ <color>00C800</color>
1148
1174
  <yaxisside>0</yaxisside>
1149
1175
  <calc_fnc>2</calc_fnc>
1150
1176
  <type>0</type>
1151
1177
  <item>
1152
1178
  <host>Apache Stats</host>
1153
- <key>apache[c_send]</key>
1179
+ <key>apache[c_dns]</key>
1154
1180
  </item>
1155
1181
  </graph_item>
1156
1182
  <graph_item>
1157
- <sortorder>8</sortorder>
1183
+ <sortorder>5</sortorder>
1158
1184
  <drawtype>0</drawtype>
1159
- <color>000096</color>
1185
+ <color>C8C8C8</color>
1160
1186
  <yaxisside>0</yaxisside>
1161
1187
  <calc_fnc>2</calc_fnc>
1162
1188
  <type>0</type>
1163
1189
  <item>
1164
1190
  <host>Apache Stats</host>
1165
- <key>apache[c_start]</key>
1191
+ <key>apache[c_log]</key>
1166
1192
  </item>
1167
1193
  </graph_item>
1168
1194
  <graph_item>
1169
- <sortorder>9</sortorder>
1195
+ <sortorder>6</sortorder>
1170
1196
  <drawtype>0</drawtype>
1171
- <color>888888</color>
1197
+ <color>960000</color>
1172
1198
  <yaxisside>0</yaxisside>
1173
1199
  <calc_fnc>2</calc_fnc>
1174
1200
  <type>0</type>
1175
1201
  <item>
1176
1202
  <host>Apache Stats</host>
1177
- <key>apache[c_waiting]</key>
1203
+ <key>apache[c_read]</key>
1178
1204
  </item>
1179
1205
  </graph_item>
1180
1206
  </graph_items>
@@ -1274,27 +1300,27 @@
1274
1300
  <ymax_item_1>0</ymax_item_1>
1275
1301
  <graph_items>
1276
1302
  <graph_item>
1277
- <sortorder>0</sortorder>
1303
+ <sortorder>1</sortorder>
1278
1304
  <drawtype>0</drawtype>
1279
- <color>C80000</color>
1305
+ <color>00C800</color>
1280
1306
  <yaxisside>0</yaxisside>
1281
1307
  <calc_fnc>7</calc_fnc>
1282
1308
  <type>0</type>
1283
1309
  <item>
1284
1310
  <host>Apache Stats</host>
1285
- <key>apache[BusyWorkers]</key>
1311
+ <key>apache[IdleWorkers]</key>
1286
1312
  </item>
1287
1313
  </graph_item>
1288
1314
  <graph_item>
1289
- <sortorder>1</sortorder>
1315
+ <sortorder>0</sortorder>
1290
1316
  <drawtype>0</drawtype>
1291
- <color>00C800</color>
1317
+ <color>C80000</color>
1292
1318
  <yaxisside>0</yaxisside>
1293
1319
  <calc_fnc>7</calc_fnc>
1294
1320
  <type>0</type>
1295
1321
  <item>
1296
1322
  <host>Apache Stats</host>
1297
- <key>apache[IdleWorkers]</key>
1323
+ <key>apache[BusyWorkers]</key>
1298
1324
  </item>
1299
1325
  </graph_item>
1300
1326
  </graph_items>
data/zabbix-templates/cpu_tpl.xml CHANGED
@@ -1,19 +1,20 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <zabbix_export>
3
3
  <version>2.0</version>
4
- <date>2014-01-02T03:31:53Z</date>
4
+ <date>2015-01-17T21:06:25Z</date>
5
5
  <groups>
6
6
  <group>
7
- <name>3. Service Ubuntu</name>
7
+ <name>3. debian</name>
8
8
  </group>
9
9
  </groups>
10
10
  <templates>
11
11
  <template>
12
12
  <template>CPU zrc</template>
13
13
  <name>CPU (zrc)</name>
14
+ <description/>
14
15
  <groups>
15
16
  <group>
16
- <name>3. Service Ubuntu</name>
17
+ <name>3. debian</name>
17
18
  </group>
18
19
  </groups>
19
20
  <applications>
@@ -63,6 +64,7 @@
63
64
  </application>
64
65
  </applications>
65
66
  <valuemap/>
67
+ <logtimefmt/>
66
68
  </item>
67
69
  <item>
68
70
  <name>CPU guest %</name>
@@ -88,7 +90,7 @@
88
90
  <snmpv3_privpassphrase/>
89
91
  <formula>1</formula>
90
92
  <delay_flex/>
91
- <params>100 * last(&quot;cpu[guest]&quot;,0) / last(&quot;cpu[total]&quot;,0)</params>
93
+ <params>100*last(&quot;cpu[guest]&quot;)/last(&quot;cpu[total]&quot;)</params>
92
94
  <ipmi_sensor/>
93
95
  <data_type>0</data_type>
94
96
  <authtype>0</authtype>
@@ -105,6 +107,7 @@
105
107
  </application>
106
108
  </applications>
107
109
  <valuemap/>
110
+ <logtimefmt/>
108
111
  </item>
109
112
  <item>
110
113
  <name>CPU idle</name>
@@ -147,6 +150,7 @@
147
150
  </application>
148
151
  </applications>
149
152
  <valuemap/>
153
+ <logtimefmt/>
150
154
  </item>
151
155
  <item>
152
156
  <name>CPU idle %</name>
@@ -172,7 +176,7 @@
172
176
  <snmpv3_privpassphrase/>
173
177
  <formula>1</formula>
174
178
  <delay_flex/>
175
- <params>100 * last(&quot;cpu[idle]&quot;,0) / last(&quot;cpu[total]&quot;,0)</params>
179
+ <params>100*last(&quot;cpu[idle]&quot;)/last(&quot;cpu[total]&quot;)</params>
176
180
  <ipmi_sensor/>
177
181
  <data_type>0</data_type>
178
182
  <authtype>0</authtype>
@@ -189,6 +193,7 @@
189
193
  </application>
190
194
  </applications>
191
195
  <valuemap/>
196
+ <logtimefmt/>
192
197
  </item>
193
198
  <item>
194
199
  <name>CPU iowait</name>
@@ -231,6 +236,7 @@
231
236
  </application>
232
237
  </applications>
233
238
  <valuemap/>
239
+ <logtimefmt/>
234
240
  </item>
235
241
  <item>
236
242
  <name>CPU iowait %</name>
@@ -256,7 +262,7 @@
256
262
  <snmpv3_privpassphrase/>
257
263
  <formula>1</formula>
258
264
  <delay_flex/>
259
- <params>100 * last(&quot;cpu[iowait]&quot;,0) / last(&quot;cpu[total]&quot;,0)</params>
265
+ <params>100*last(&quot;cpu[iowait]&quot;)/last(&quot;cpu[total]&quot;)</params>
260
266
  <ipmi_sensor/>
261
267
  <data_type>0</data_type>
262
268
  <authtype>0</authtype>
@@ -273,6 +279,7 @@
273
279
  </application>
274
280
  </applications>
275
281
  <valuemap/>
282
+ <logtimefmt/>
276
283
  </item>
277
284
  <item>
278
285
  <name>CPU irq</name>
@@ -315,6 +322,7 @@
315
322
  </application>
316
323
  </applications>
317
324
  <valuemap/>
325
+ <logtimefmt/>
318
326
  </item>
319
327
  <item>
320
328
  <name>CPU irq %</name>
@@ -340,7 +348,7 @@
340
348
  <snmpv3_privpassphrase/>
341
349
  <formula>1</formula>
342
350
  <delay_flex/>
343
- <params>100 * last(&quot;cpu[irq]&quot;,0) / last(&quot;cpu[total]&quot;,0)</params>
351
+ <params>100*last(&quot;cpu[irq]&quot;)/last(&quot;cpu[total]&quot;)</params>
344
352
  <ipmi_sensor/>
345
353
  <data_type>0</data_type>
346
354
  <authtype>0</authtype>
@@ -357,6 +365,7 @@
357
365
  </application>
358
366
  </applications>
359
367
  <valuemap/>
368
+ <logtimefmt/>
360
369
  </item>
361
370
  <item>
362
371
  <name>CPU nice</name>
@@ -399,6 +408,7 @@
399
408
  </application>
400
409
  </applications>
401
410
  <valuemap/>
411
+ <logtimefmt/>
402
412
  </item>
403
413
  <item>
404
414
  <name>CPU nice %</name>
@@ -424,7 +434,7 @@
424
434
  <snmpv3_privpassphrase/>
425
435
  <formula>1</formula>
426
436
  <delay_flex/>
427
- <params>100 * last(&quot;cpu[nice]&quot;,0) / last(&quot;cpu[total]&quot;,0)</params>
437
+ <params>100*last(&quot;cpu[nice]&quot;)/last(&quot;cpu[total]&quot;)</params>
428
438
  <ipmi_sensor/>
429
439
  <data_type>0</data_type>
430
440
  <authtype>0</authtype>
@@ -441,6 +451,7 @@
441
451
  </application>
442
452
  </applications>
443
453
  <valuemap/>
454
+ <logtimefmt/>
444
455
  </item>
445
456
  <item>
446
457
  <name>CPU soft</name>
@@ -483,6 +494,7 @@
483
494
  </application>
484
495
  </applications>
485
496
  <valuemap/>
497
+ <logtimefmt/>
486
498
  </item>
487
499
  <item>
488
500
  <name>CPU soft %</name>
@@ -508,7 +520,7 @@
508
520
  <snmpv3_privpassphrase/>
509
521
  <formula>1</formula>
510
522
  <delay_flex/>
511
- <params>100 * last(&quot;cpu[soft]&quot;,0) / last(&quot;cpu[total]&quot;,0)</params>
523
+ <params>100*last(&quot;cpu[soft]&quot;)/last(&quot;cpu[total]&quot;)</params>
512
524
  <ipmi_sensor/>
513
525
  <data_type>0</data_type>
514
526
  <authtype>0</authtype>
@@ -525,6 +537,7 @@
525
537
  </application>
526
538
  </applications>
527
539
  <valuemap/>
540
+ <logtimefmt/>
528
541
  </item>
529
542
  <item>
530
543
  <name>CPU steal</name>
@@ -567,6 +580,7 @@
567
580
  </application>
568
581
  </applications>
569
582
  <valuemap/>
583
+ <logtimefmt/>
570
584
  </item>
571
585
  <item>
572
586
  <name>CPU steal %</name>
@@ -592,7 +606,7 @@
592
606
  <snmpv3_privpassphrase/>
593
607
  <formula>1</formula>
594
608
  <delay_flex/>
595
- <params>100 * last(&quot;cpu[steal]&quot;,0) / last(&quot;cpu[total]&quot;,0)</params>
609
+ <params>100*last(&quot;cpu[steal]&quot;)/last(&quot;cpu[total]&quot;)</params>
596
610
  <ipmi_sensor/>
597
611
  <data_type>0</data_type>
598
612
  <authtype>0</authtype>
@@ -609,6 +623,7 @@
609
623
  </application>
610
624
  </applications>
611
625
  <valuemap/>
626
+ <logtimefmt/>
612
627
  </item>
613
628
  <item>
614
629
  <name>CPU system</name>
@@ -651,6 +666,7 @@
651
666
  </application>
652
667
  </applications>
653
668
  <valuemap/>
669
+ <logtimefmt/>
654
670
  </item>
655
671
  <item>
656
672
  <name>CPU system %</name>
@@ -676,7 +692,7 @@
676
692
  <snmpv3_privpassphrase/>
677
693
  <formula>1</formula>
678
694
  <delay_flex/>
679
- <params>100 * last(&quot;cpu[system]&quot;,0) / last(&quot;cpu[total]&quot;,0)</params>
695
+ <params>100*last(&quot;cpu[system]&quot;,0)/last(&quot;cpu[total]&quot;,0)</params>
680
696
  <ipmi_sensor/>
681
697
  <data_type>0</data_type>
682
698
  <authtype>0</authtype>
@@ -693,6 +709,7 @@
693
709
  </application>
694
710
  </applications>
695
711
  <valuemap/>
712
+ <logtimefmt/>
696
713
  </item>
697
714
  <item>
698
715
  <name>CPU total</name>
@@ -735,6 +752,7 @@
735
752
  </application>
736
753
  </applications>
737
754
  <valuemap/>
755
+ <logtimefmt/>
738
756
  </item>
739
757
  <item>
740
758
  <name>CPU used</name>
@@ -777,6 +795,7 @@
777
795
  </application>
778
796
  </applications>
779
797
  <valuemap/>
798
+ <logtimefmt/>
780
799
  </item>
781
800
  <item>
782
801
  <name>CPU used %</name>
@@ -802,7 +821,7 @@
802
821
  <snmpv3_privpassphrase/>
803
822
  <formula>1</formula>
804
823
  <delay_flex/>
805
- <params>100 * last(&quot;cpu[used]&quot;,0) / last(&quot;cpu[total]&quot;,0)</params>
824
+ <params>100*last(&quot;cpu[used]&quot;)/last(&quot;cpu[total]&quot;)</params>
806
825
  <ipmi_sensor/>
807
826
  <data_type>0</data_type>
808
827
  <authtype>0</authtype>
@@ -819,6 +838,7 @@
819
838
  </application>
820
839
  </applications>
821
840
  <valuemap/>
841
+ <logtimefmt/>
822
842
  </item>
823
843
  <item>
824
844
  <name>CPU user</name>
@@ -861,6 +881,7 @@
861
881
  </application>
862
882
  </applications>
863
883
  <valuemap/>
884
+ <logtimefmt/>
864
885
  </item>
865
886
  <item>
866
887
  <name>CPU user %</name>
@@ -886,7 +907,7 @@
886
907
  <snmpv3_privpassphrase/>
887
908
  <formula>1</formula>
888
909
  <delay_flex/>
889
- <params>100 * last(&quot;cpu[user]&quot;,0) / last(&quot;cpu[total]&quot;,0)</params>
910
+ <params>100*last(&quot;cpu[user]&quot;)/last(&quot;cpu[total]&quot;)</params>
890
911
  <ipmi_sensor/>
891
912
  <data_type>0</data_type>
892
913
  <authtype>0</authtype>
@@ -903,6 +924,7 @@
903
924
  </application>
904
925
  </applications>
905
926
  <valuemap/>
927
+ <logtimefmt/>
906
928
  </item>
907
929
  </items>
908
930
  <discovery_rules/>
@@ -958,99 +980,99 @@
958
980
  <ymax_item_1>0</ymax_item_1>
959
981
  <graph_items>
960
982
  <graph_item>
961
- <sortorder>0</sortorder>
983
+ <sortorder>3</sortorder>
962
984
  <drawtype>0</drawtype>
963
- <color>23AA10</color>
985
+ <color>BC5000</color>
964
986
  <yaxisside>0</yaxisside>
965
987
  <calc_fnc>2</calc_fnc>
966
988
  <type>0</type>
967
989
  <item>
968
990
  <host>CPU zrc</host>
969
- <key>cpu[user_percent]</key>
991
+ <key>cpu[steal_percent]</key>
970
992
  </item>
971
993
  </graph_item>
972
994
  <graph_item>
973
- <sortorder>1</sortorder>
995
+ <sortorder>5</sortorder>
974
996
  <drawtype>0</drawtype>
975
- <color>1023AA</color>
997
+ <color>53A3D3</color>
976
998
  <yaxisside>0</yaxisside>
977
999
  <calc_fnc>2</calc_fnc>
978
1000
  <type>0</type>
979
1001
  <item>
980
1002
  <host>CPU zrc</host>
981
- <key>cpu[system_percent]</key>
1003
+ <key>cpu[iowait_percent]</key>
982
1004
  </item>
983
1005
  </graph_item>
984
1006
  <graph_item>
985
- <sortorder>2</sortorder>
1007
+ <sortorder>6</sortorder>
986
1008
  <drawtype>0</drawtype>
987
- <color>6699AA</color>
1009
+ <color>938320</color>
988
1010
  <yaxisside>0</yaxisside>
989
1011
  <calc_fnc>2</calc_fnc>
990
1012
  <type>0</type>
991
1013
  <item>
992
1014
  <host>CPU zrc</host>
993
- <key>cpu[nice_percent]</key>
1015
+ <key>cpu[irq_percent]</key>
994
1016
  </item>
995
1017
  </graph_item>
996
1018
  <graph_item>
997
- <sortorder>3</sortorder>
1019
+ <sortorder>4</sortorder>
998
1020
  <drawtype>0</drawtype>
999
- <color>BC5000</color>
1021
+ <color>D3D300</color>
1000
1022
  <yaxisside>0</yaxisside>
1001
1023
  <calc_fnc>2</calc_fnc>
1002
1024
  <type>0</type>
1003
1025
  <item>
1004
1026
  <host>CPU zrc</host>
1005
- <key>cpu[steal_percent]</key>
1027
+ <key>cpu[guest_percent]</key>
1006
1028
  </item>
1007
1029
  </graph_item>
1008
1030
  <graph_item>
1009
- <sortorder>4</sortorder>
1031
+ <sortorder>0</sortorder>
1010
1032
  <drawtype>0</drawtype>
1011
- <color>D3D300</color>
1033
+ <color>23AA10</color>
1012
1034
  <yaxisside>0</yaxisside>
1013
1035
  <calc_fnc>2</calc_fnc>
1014
1036
  <type>0</type>
1015
1037
  <item>
1016
1038
  <host>CPU zrc</host>
1017
- <key>cpu[guest_percent]</key>
1039
+ <key>cpu[user_percent]</key>
1018
1040
  </item>
1019
1041
  </graph_item>
1020
1042
  <graph_item>
1021
- <sortorder>5</sortorder>
1043
+ <sortorder>2</sortorder>
1022
1044
  <drawtype>0</drawtype>
1023
- <color>53A3D3</color>
1045
+ <color>6699AA</color>
1024
1046
  <yaxisside>0</yaxisside>
1025
1047
  <calc_fnc>2</calc_fnc>
1026
1048
  <type>0</type>
1027
1049
  <item>
1028
1050
  <host>CPU zrc</host>
1029
- <key>cpu[iowait_percent]</key>
1051
+ <key>cpu[nice_percent]</key>
1030
1052
  </item>
1031
1053
  </graph_item>
1032
1054
  <graph_item>
1033
- <sortorder>6</sortorder>
1055
+ <sortorder>7</sortorder>
1034
1056
  <drawtype>0</drawtype>
1035
- <color>938320</color>
1057
+ <color>53D3A3</color>
1036
1058
  <yaxisside>0</yaxisside>
1037
1059
  <calc_fnc>2</calc_fnc>
1038
1060
  <type>0</type>
1039
1061
  <item>
1040
1062
  <host>CPU zrc</host>
1041
- <key>cpu[irq_percent]</key>
1063
+ <key>cpu[soft_percent]</key>
1042
1064
  </item>
1043
1065
  </graph_item>
1044
1066
  <graph_item>
1045
- <sortorder>7</sortorder>
1067
+ <sortorder>1</sortorder>
1046
1068
  <drawtype>0</drawtype>
1047
- <color>53D3A3</color>
1069
+ <color>1023AA</color>
1048
1070
  <yaxisside>0</yaxisside>
1049
1071
  <calc_fnc>2</calc_fnc>
1050
1072
  <type>0</type>
1051
1073
  <item>
1052
1074
  <host>CPU zrc</host>
1053
- <key>cpu[soft_percent]</key>
1075
+ <key>cpu[system_percent]</key>
1054
1076
  </item>
1055
1077
  </graph_item>
1056
1078
  </graph_items>
@@ -1106,99 +1128,99 @@
1106
1128
  <ymax_item_1>0</ymax_item_1>
1107
1129
  <graph_items>
1108
1130
  <graph_item>
1109
- <sortorder>0</sortorder>
1131
+ <sortorder>2</sortorder>
1110
1132
  <drawtype>0</drawtype>
1111
- <color>23AA10</color>
1133
+ <color>6699AA</color>
1112
1134
  <yaxisside>0</yaxisside>
1113
1135
  <calc_fnc>2</calc_fnc>
1114
1136
  <type>0</type>
1115
1137
  <item>
1116
1138
  <host>CPU zrc</host>
1117
- <key>cpu[user_percent]</key>
1139
+ <key>cpu[nice_percent]</key>
1118
1140
  </item>
1119
1141
  </graph_item>
1120
1142
  <graph_item>
1121
- <sortorder>2</sortorder>
1143
+ <sortorder>5</sortorder>
1122
1144
  <drawtype>0</drawtype>
1123
- <color>6699AA</color>
1145
+ <color>53A3D3</color>
1124
1146
  <yaxisside>0</yaxisside>
1125
1147
  <calc_fnc>2</calc_fnc>
1126
1148
  <type>0</type>
1127
1149
  <item>
1128
1150
  <host>CPU zrc</host>
1129
- <key>cpu[nice_percent]</key>
1151
+ <key>cpu[iowait_percent]</key>
1130
1152
  </item>
1131
1153
  </graph_item>
1132
1154
  <graph_item>
1133
- <sortorder>1</sortorder>
1155
+ <sortorder>6</sortorder>
1134
1156
  <drawtype>0</drawtype>
1135
- <color>1023AA</color>
1157
+ <color>938320</color>
1136
1158
  <yaxisside>0</yaxisside>
1137
1159
  <calc_fnc>2</calc_fnc>
1138
1160
  <type>0</type>
1139
1161
  <item>
1140
1162
  <host>CPU zrc</host>
1141
- <key>cpu[system_percent]</key>
1163
+ <key>cpu[irq_percent]</key>
1142
1164
  </item>
1143
1165
  </graph_item>
1144
1166
  <graph_item>
1145
- <sortorder>3</sortorder>
1167
+ <sortorder>4</sortorder>
1146
1168
  <drawtype>0</drawtype>
1147
- <color>BC5000</color>
1169
+ <color>D3D300</color>
1148
1170
  <yaxisside>0</yaxisside>
1149
1171
  <calc_fnc>2</calc_fnc>
1150
1172
  <type>0</type>
1151
1173
  <item>
1152
1174
  <host>CPU zrc</host>
1153
- <key>cpu[steal_percent]</key>
1175
+ <key>cpu[guest_percent]</key>
1154
1176
  </item>
1155
1177
  </graph_item>
1156
1178
  <graph_item>
1157
- <sortorder>4</sortorder>
1179
+ <sortorder>7</sortorder>
1158
1180
  <drawtype>0</drawtype>
1159
- <color>D3D300</color>
1181
+ <color>53D3A3</color>
1160
1182
  <yaxisside>0</yaxisside>
1161
1183
  <calc_fnc>2</calc_fnc>
1162
1184
  <type>0</type>
1163
1185
  <item>
1164
1186
  <host>CPU zrc</host>
1165
- <key>cpu[guest_percent]</key>
1187
+ <key>cpu[soft_percent]</key>
1166
1188
  </item>
1167
1189
  </graph_item>
1168
1190
  <graph_item>
1169
- <sortorder>5</sortorder>
1191
+ <sortorder>3</sortorder>
1170
1192
  <drawtype>0</drawtype>
1171
- <color>53A3D3</color>
1193
+ <color>BC5000</color>
1172
1194
  <yaxisside>0</yaxisside>
1173
1195
  <calc_fnc>2</calc_fnc>
1174
1196
  <type>0</type>
1175
1197
  <item>
1176
1198
  <host>CPU zrc</host>
1177
- <key>cpu[iowait_percent]</key>
1199
+ <key>cpu[steal_percent]</key>
1178
1200
  </item>
1179
1201
  </graph_item>
1180
1202
  <graph_item>
1181
- <sortorder>6</sortorder>
1203
+ <sortorder>1</sortorder>
1182
1204
  <drawtype>0</drawtype>
1183
- <color>938320</color>
1205
+ <color>1023AA</color>
1184
1206
  <yaxisside>0</yaxisside>
1185
1207
  <calc_fnc>2</calc_fnc>
1186
1208
  <type>0</type>
1187
1209
  <item>
1188
1210
  <host>CPU zrc</host>
1189
- <key>cpu[irq_percent]</key>
1211
+ <key>cpu[system_percent]</key>
1190
1212
  </item>
1191
1213
  </graph_item>
1192
1214
  <graph_item>
1193
- <sortorder>7</sortorder>
1215
+ <sortorder>0</sortorder>
1194
1216
  <drawtype>0</drawtype>
1195
- <color>53D3A3</color>
1217
+ <color>23AA10</color>
1196
1218
  <yaxisside>0</yaxisside>
1197
1219
  <calc_fnc>2</calc_fnc>
1198
1220
  <type>0</type>
1199
1221
  <item>
1200
1222
  <host>CPU zrc</host>
1201
- <key>cpu[soft_percent]</key>
1223
+ <key>cpu[user_percent]</key>
1202
1224
  </item>
1203
1225
  </graph_item>
1204
1226
  </graph_items>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: zabbix-ruby-client
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - mose
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-08-28 00:00:00.000000000 Z
11
+ date: 2015-01-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
@@ -108,6 +108,7 @@ files:
108
108
  - ".travis.yml"
109
109
  - CHANGELOG.md
110
110
  - Gemfile
111
+ - Gemfile-packaging
111
112
  - Gemfile.lock
112
113
  - LICENSE.txt
113
114
  - README.md
@@ -138,6 +139,10 @@ files:
138
139
  - lib/zabbix-ruby-client/runner.rb
139
140
  - lib/zabbix-ruby-client/store.rb
140
141
  - lib/zabbix-ruby-client/version.rb
142
+ - packaging/Gemfile
143
+ - packaging/Gemfile.lock
144
+ - packaging/bundler-config
145
+ - packaging/run.sh
141
146
  - spec/files/config.yml
142
147
  - spec/files/data/.gitkeep
143
148
  - spec/files/logs/.gitkeep
@@ -218,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
218
223
  version: '0'
219
224
  requirements: []
220
225
  rubyforge_project:
221
- rubygems_version: 2.2.2
226
+ rubygems_version: 2.4.5
222
227
  signing_key:
223
228
  specification_version: 4
224
229
  summary: This tool is intended to use zabbix sender to propagate monitoring data for