riemann-babbler 2.5.4 → 2.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da4839c0bd87da8889289f793aed5fa86e8e0ccc
-  data.tar.gz: 6a1f6fb80ed68da4266c12766fe93ed7e3851638
+  metadata.gz: 90e56de248d738dad01c1b11d060ba3a245cd59a
+  data.tar.gz: c6b4be229437856a110fea11ac1c344c7b985cb9
 SHA512:
-  metadata.gz: 08eb1b69bb88e58874feaaf888ffbd3621522a46794f03a867dff1fdfff54e1e4cd602be851976440a7f993c1101a164cc498fe4b26f1535a093e06daa9061d5
-  data.tar.gz: b5b8ecc2bcc5f951561e22f6ddcd2c8e454c36a8fcb04d7652a9269c822ecf93729f99a721448b405b3bfee8b07521ca4f094c175afb392e1c457ed173d7b0b0
+  metadata.gz: d7da5a831710d13b4fda243fa804532bc53cb3dfe471eb31b99734b653bc1777bb75174ab021a603351d8fc2827877263cdc2b347318b89a164e674d236fc22f
+  data.tar.gz: b3a1f2159b23e51817e55eeb95457020fdf910e28ce0b7e88621fe1e5adea094343e2af312291f4e57d2ace00442d35d85f4a5135ba3c4f2b4f428b0f1952329

data/lib/riemann/babbler/plugins/disk.rb

@@ -5,7 +5,12 @@ class Riemann::Babbler::Plugin::Disk < Riemann::Babbler::Plugin
   require 'sys/filesystem'
   include Sys
 
-  NOT_MONITORING_FS = %w(sysfs nfs devpts squashfs proc devtmpfs)
+  # check size:
+  NOT_MONITORING_FS_FOR_SIZE = %w(sysfs nfs devpts squashfs proc devtmpfs)
+  # fstab:
+  MONITORING_FS_FOR_FSTAB = %w(ext2 ext3 ext4 xfs tmpfs)
+  NOT_MONIT_DEVICE_FOR_FSTAB = %w(none)
+  NOT_MONITORING_POINT_FOR_FSTAB = %w(/lib/init/rw /dev/shm /dev)
 
   def init
     plugin.set_default(:service, 'disk')
@@ -13,19 +18,46 @@ class Riemann::Babbler::Plugin::Disk < Riemann::Babbler::Plugin
     plugin.states.set_default(:critical, 85)
   end
 
-  def collect
+  def get_fstab
+    fstab = File.read('/etc/fstab').split("\n").delete_if { |x| x.strip.match(/^#/) }
+    fstab.join("\n")
+  end
+
+  def get_monit_points_for_size
     # собираем только необходимые для мониторинга маунт-поинты
     # точнее выбираем из mounts только те, у которых fstype не попадает
-    # в NOT_MONITORING_FS
+    # в NOT_MONITORING_SIZE_FOR_FS
     monit_points = []
     File.open('/proc/mounts', 'r') do |file|
       while (line = file.gets)
         mtab = line.split(/\s+/)
-        monit_points << mtab[1] unless NOT_MONITORING_FS.include? mtab[2]
+        monit_points << mtab[1] unless NOT_MONITORING_FS_FOR_SIZE.include? mtab[2]
       end
     end
+    monit_points
+  end
+
+  def get_monit_points_for_fstab
+    # выбираем из mounts только те, у которых fstype попадает
+    # в MONITORING_SIZE_FOR_FS
+    monit_points = []
+    File.open('/proc/mounts', 'r') do |file|
+      while (line = file.gets)
+        mtab = line.split(/\s+/)
+        if MONITORING_FS_FOR_FSTAB.include?(mtab[2]) && 
+            !NOT_MONITORING_POINT_FOR_FSTAB.include?(mtab[1]) && 
+            !NOT_MONIT_DEVICE_FOR_FSTAB.include?(mtab[0])
+          monit_points << mtab[1] 
+        end
+      end
+    end
+    monit_points
+  end
+
+  def collect
+    fstab = get_fstab
     disk = Array.new
-    monit_points.each do |point|
+    get_monit_points_for_size.each do |point|
       point_stat  = Filesystem.stat point
       human_point = point == '/' ? '/root' : point
       human_point = human_point.gsub(/^\//, '').gsub(/\//, '_')
@@ -34,6 +66,9 @@ class Riemann::Babbler::Plugin::Disk < Riemann::Babbler::Plugin
       disk << { :service => plugin.service + " #{human_point} abs free", :description => "Disk free #{point}, B", :metric => point_stat.blocks_free * point_stat.block_size, :state => 'ok' }
       disk << { :service => plugin.service + " #{human_point} abs total", :description => "Disk space #{point}, B", :metric => point_stat.blocks * point_stat.block_size, :state => 'ok' }
     end
+    get_monit_points_for_fstab.each do |point|
+      disk << { :service => plugin.service + " #{point} fstab entry", :description => "Mount point #{point} not matched in /etc/fstab", :state => 'critical' } unless fstab.match("#{point} ")
+    end
     disk
   end
 

data/lib/riemann/babbler/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   module Babbler
-    VERSION = '2.5.4'
+    VERSION = '2.5.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 2.5.5
 platform: ruby
 authors:
 - Vasiliev Dmitry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client