riemann-babbler 1.0.8.3 → 1.0.8.4

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

@@ -2,14 +2,32 @@ class Riemann::Babbler::NetStat < Riemann::Babbler
 
   def init
     plugin.set_default(:service, 'netstat')
-    plugin.set_default(:interval, 60)
-    plugin.set_default(:port, 80)
-    plugin.states.set_default(:warning, 300)
-    plugin.states.set_default(:critical, 400)
+    plugin.set_default(:interval, 5)
+    plugin.set_default(:ports, [80, 3994])
+    plugin.states.set_default(:warning, nil)
+    plugin.states.set_default(:critical, nil)
+  end
+
+  def get_conn_count
+    filter = nil
+    plugin.ports.each do |port|
+      if filter == nil
+        filter = "\\( src *:#{port}"
+      else
+        filter += " or src *:#{port}"
+      end
+    end
+    filter += " \\) and not dst 127.0.0.1:*"
+    cmd = "ss -t -4 -n state established " + filter + " | wc -l"
+    shell(cmd).to_i - 1
   end
 
   def collect
-    count = shell("netstat -nat4 | egrep -e ':#{plugin.port}\s'  | grep ESTA | wc -l").to_i
-    {:service => "#{plugin.service} tcp #{plugin.port}", :metric => count, :description => "count established connects: #{count} to port #{plugin.port}"}
+    count = get_conn_count()
+    {
+      :service => "#{plugin.service} tcp #{plugin.ports.join(', ')}",
+      :metric => count, 
+      :description => "count established connects: #{count} to ports #{plugin.ports.join(', ')}"
+    }
   end
 end

data/lib/riemann/babbler/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   class Babbler
-    VERSION = '1.0.8.3'
+    VERSION = '1.0.8.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 1.0.8.3
+  version: 1.0.8.4
   prerelease: 
 platform: ruby
 authors: