riemann-babbler 1.0.8 → 1.0.8.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -24,9 +24,9 @@ class Riemann::Babbler::Http < Riemann::Babbler
24
24
  command += " --max-time #{plugin.max_time} --fail"
25
25
  command += " #{plugin.url} -o /dev/null"
26
26
 
27
- out = shell(command)
27
+ out = shell(command).to_i
28
28
 
29
- if out.to_i != plugin.http_code
29
+ if out != plugin.http_code
30
30
  metric = 1
31
31
  else
32
32
  metric = 0
@@ -1,8 +1,7 @@
1
1
  class Riemann::Babbler::Nginx < Riemann::Babbler
2
2
 
3
- NGINX_STATUS_1 = %W(accepts handled requests)
4
-
5
- NGINX_STATUS_2 = %W(reading writing waiting)
3
+ NGINX_STATUS_1 = %W(accepts handled requests)
4
+ NGINX_STATUS_2 = %W(reading writing waiting)
6
5
 
7
6
  def init
8
7
  plugin.set_default(:service, 'nginx')
@@ -19,10 +19,12 @@ class Riemann::Babbler::Runit < Riemann::Babbler
19
19
  stat_file = File.join(srv, 'supervise', 'stat')
20
20
  next unless File.exists? stat_file
21
21
  if File.read( stat_file ).strip == 'run'
22
- @status_history.delete 'human_srv'
22
+ @status_history.delete human_srv
23
23
  status << {:service => plugin.service + human_srv , :state => 'ok', :description => "runit service #{human_srv} running"}
24
24
  else
25
- status << {:service => plugin.service + human_srv , :state => 'critical', :description => "runit service #{human_srv} not running"} if @status_history.include? human_srv
25
+ if @status_history.include? human_srv
26
+ status << {:service => plugin.service + human_srv , :state => 'critical', :description => "runit service #{human_srv} not running"}
27
+ end
26
28
  @status_history << human_srv unless @status_history.include? human_srv
27
29
  end
28
30
  end
File without changes
@@ -1,5 +1,5 @@
1
1
  module Riemann
2
2
  class Babbler
3
- VERSION = '1.0.8'
3
+ VERSION = '1.0.8.1'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: riemann-babbler
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.8
4
+ version: 1.0.8.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-07-01 00:00:00.000000000 Z
12
+ date: 2013-07-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: riemann-client
@@ -158,22 +158,22 @@ files:
158
158
  - config.yml
159
159
  - lib/riemann/babbler.rb
160
160
  - lib/riemann/babbler/plugins/cpu.rb
161
- - lib/riemann/babbler/plugins/cpufan.rb
162
- - lib/riemann/babbler/plugins/cputemp.rb
161
+ - lib/riemann/babbler/plugins/cpu_fan.rb
162
+ - lib/riemann/babbler/plugins/cpu_temp.rb
163
163
  - lib/riemann/babbler/plugins/disk.rb
164
164
  - lib/riemann/babbler/plugins/dummy.rb
165
165
  - lib/riemann/babbler/plugins/exim4.rb
166
166
  - lib/riemann/babbler/plugins/http.rb
167
167
  - lib/riemann/babbler/plugins/la.rb
168
168
  - lib/riemann/babbler/plugins/mdadm.rb
169
- - lib/riemann/babbler/plugins/megacli.rb
169
+ - lib/riemann/babbler/plugins/mega_cli.rb
170
170
  - lib/riemann/babbler/plugins/memory.rb
171
171
  - lib/riemann/babbler/plugins/net.rb
172
- - lib/riemann/babbler/plugins/netstat.rb
172
+ - lib/riemann/babbler/plugins/net_stat.rb
173
173
  - lib/riemann/babbler/plugins/nginx.rb
174
174
  - lib/riemann/babbler/plugins/runit.rb
175
- - lib/riemann/babbler/plugins/statusfile.rb
176
- - lib/riemann/babbler/plugins/twcli.rb
175
+ - lib/riemann/babbler/plugins/status_file.rb
176
+ - lib/riemann/babbler/plugins/tw_cli.rb
177
177
  - lib/riemann/babbler/start.rb
178
178
  - lib/riemann/babbler/support/deep_merge.rb
179
179
  - lib/riemann/babbler/support/monkey_patches.rb