riemann-babbler 0.8.4 → 0.8.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.
@@ -32,7 +32,7 @@ class Riemann::Babbler::Cpu < Riemann::Babbler
|
|
32
32
|
end
|
33
33
|
|
34
34
|
@old_cpu[cpu_number] = [u2, n2, s2, i2]
|
35
|
-
array << { :service => plugin.service + " cpu#{cpu_number}", :metric => fraction, :description => "
|
35
|
+
array << { :service => plugin.service + " cpu#{cpu_number}", :metric => fraction, :description => "Cpu#{cpu_number} utilization\n\n" + description } if fraction
|
36
36
|
end
|
37
37
|
array
|
38
38
|
end
|
@@ -28,10 +28,10 @@ class Riemann::Babbler::Disk < Riemann::Babbler
|
|
28
28
|
point_stat = Filesystem.stat point
|
29
29
|
human_point = point == "/" ? "/root" : point
|
30
30
|
human_point.gsub!(/^\//, "").gsub!(/\//, "_")
|
31
|
-
disk << { :service => plugin.service + " #{human_point} % block", :description => "
|
32
|
-
disk << { :service => plugin.service + " #{human_point} % inode", :description => "
|
33
|
-
disk << { :service => plugin.service + " #{human_point} abs free", :description => "
|
34
|
-
disk << { :service => plugin.service + " #{human_point} abs total", :description => "
|
31
|
+
disk << { :service => plugin.service + " #{human_point} % block", :description => "Disk usage #{point_stat}, %", :metric => (1- point_stat.blocks_available.to_f/point_stat.blocks).round(2) * 100 }
|
32
|
+
disk << { :service => plugin.service + " #{human_point} % inode", :description => "Disk usage #{point_stat}, inodes %", :metric => (1 - point_stat.files_available.to_f/point_stat.files).round(2) * 100 }
|
33
|
+
disk << { :service => plugin.service + " #{human_point} abs free", :description => "Disk free #{point_stat}, B", :metric => point_stat.blocks_free * point_stat.block_size, :state => 'ok'}
|
34
|
+
disk << { :service => plugin.service + " #{human_point} abs total", :description => "Disk space #{point_stat}, B", :metric => point_stat.blocks * point_stat.block_size, :state => 'ok'}
|
35
35
|
end
|
36
36
|
disk
|
37
37
|
end
|
@@ -3,7 +3,7 @@
|
|
3
3
|
class Riemann::Babbler::La < Riemann::Babbler
|
4
4
|
|
5
5
|
def collect
|
6
|
-
{ :service => plugin.service + " la_1", :description => "LA
|
6
|
+
{ :service => plugin.service + " la_1", :description => "LA averaged over 1 minute", :metric => File.read('/proc/loadavg').split(/\s+/)[2].to_f }
|
7
7
|
end
|
8
8
|
|
9
9
|
end
|
@@ -21,14 +21,14 @@ class Riemann::Babbler::Memory < Riemann::Babbler
|
|
21
21
|
desc = "usage\n\n#{shell('ps -eo pcpu,pid,cmd --sort -pmem | head -10').chomp}"
|
22
22
|
|
23
23
|
[
|
24
|
-
{ :service => plugin.service + " % free", :description => "
|
25
|
-
{ :service => plugin.service + " % swap", :description => "
|
26
|
-
{ :service => plugin.service + " abs free", :description => "
|
27
|
-
{ :service => plugin.service + " abs total", :description => "
|
28
|
-
{ :service => plugin.service + " abs cached", :description => "
|
29
|
-
{ :service => plugin.service + " abs buffers", :description => "
|
30
|
-
{ :service => plugin.service + " abs used", :description => "
|
31
|
-
{ :service => plugin.service + " abs free_bc", :description => "
|
24
|
+
{ :service => plugin.service + " % free", :description => "Memory usage, %", :metric => fraction.round(2) * 100 },
|
25
|
+
{ :service => plugin.service + " % swap", :description => "Swap usage, %", :metric => swap_fraction.round(2) * 100 },
|
26
|
+
{ :service => plugin.service + " abs free", :description => "Memory free (kB)\n\n #{desc}", :metric => free, :state => 'ok' },
|
27
|
+
{ :service => plugin.service + " abs total", :description => "Memory total (kB)\n\n #{desc}", :metric => total, :state => 'ok' },
|
28
|
+
{ :service => plugin.service + " abs cached", :description => "Memory usage, cached (kB)\n\n #{desc}", :metric => cached, :state => 'ok' },
|
29
|
+
{ :service => plugin.service + " abs buffers", :description => "Memory usage, buffers (kB)\n\n #{desc}", :metric => buffers, :state => 'ok' },
|
30
|
+
{ :service => plugin.service + " abs used", :description => "Memory usage, used (kB)\n\n #{desc}", :metric => used , :state => 'ok' },
|
31
|
+
{ :service => plugin.service + " abs free_bc", :description => "Memory usage with cache и buffers (kB)\n\n #{desc}", :metric => free_bc , :state => 'ok' }
|
32
32
|
]
|
33
33
|
end
|
34
34
|
|
@@ -28,7 +28,7 @@ class Riemann::Babbler::Net < Riemann::Babbler
|
|
28
28
|
end.zip(
|
29
29
|
$2.split(/\s+/).map { |str| str.to_i }
|
30
30
|
).each do |service, value|
|
31
|
-
status << { :service => service, :metric => value, :as_diff => true
|
31
|
+
status << { :service => service, :metric => value, :as_diff => true}
|
32
32
|
end
|
33
33
|
end
|
34
34
|
status
|
data/lib/riemann/version.rb
CHANGED
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.8.
|
4
|
+
version: 0.8.5
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -165,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
165
165
|
version: '0'
|
166
166
|
segments:
|
167
167
|
- 0
|
168
|
-
hash:
|
168
|
+
hash: 67433924589173159
|
169
169
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
170
170
|
none: false
|
171
171
|
requirements:
|