riemann-babbler 0.9.4 → 0.9.5

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.
@@ -20,10 +20,7 @@ module Riemann
20
20
  timeout_shell = ( plugin.interval * 2 ).to_f/3
21
21
  Timeout::timeout(timeout_shell) {
22
22
  Open3.popen3(*cmd) do |stdin, stdout, stderr, wait_thread|
23
-
24
-
25
23
  [stdin, stdout, stderr].each{|stream| stream.send('close')}
26
-
27
24
  end
28
25
  }
29
26
  rescue => e
@@ -33,7 +30,7 @@ module Riemann
33
30
  err = err.chomp if err
34
31
  helper_error(err)
35
32
  elsif out
36
- return out.chomp
33
+ return out.strip
37
34
  else
38
35
  # статус 0, вывода stdout нет
39
36
  ''
@@ -16,7 +16,7 @@ class Riemann::Babbler::Nginx < Riemann::Babbler
16
16
  plugin.set_default(:service, 'nginx')
17
17
  plugin.set_default(:status_file, '/etc/nginx/sites-enabled/status')
18
18
  plugin.set_default(:status_url, 'http://127.0.0.1:11311/status')
19
- plugin.set_default(:interval, 1)
19
+ plugin.set_default(:interval, 60)
20
20
  end
21
21
 
22
22
  def run_plugin
@@ -33,7 +33,7 @@ class Riemann::Babbler::Nginx < Riemann::Babbler
33
33
  status << { :service => plugin.service + " active", :metric => lines[0].split(":")[1].strip.to_i }
34
34
  # lines[3]: Reading: 0 Writing: 1 Waiting: 0
35
35
  lines[3].scan(/\d+/).each_with_index do |value, index|
36
- status << { :service => plugin.service + " #{NGINX_STATUS_2[index]}", :metric => value }
36
+ status << { :service => plugin.service + " #{NGINX_STATUS_2[index]}", :metric => value.to_i }
37
37
  end
38
38
  status
39
39
  end
@@ -1,5 +1,5 @@
1
1
  module Riemann
2
2
  class Babbler
3
- VERSION = '0.9.4'
3
+ VERSION = '0.9.5'
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: 0.9.4
4
+ version: 0.9.5
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-05-08 00:00:00.000000000 Z
12
+ date: 2013-05-13 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: riemann-client
@@ -190,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
190
190
  version: '0'
191
191
  segments:
192
192
  - 0
193
- hash: -4563871217490186575
193
+ hash: 2757420967173971732
194
194
  required_rubygems_version: !ruby/object:Gem::Requirement
195
195
  none: false
196
196
  requirements: