riemann-tools 0.2.6 → 0.2.7

data/bin/riemann-diskstats

@@ -63,13 +63,22 @@ class Riemann::Tools::Diskstats
 
     if @old_state
       state.each do |service, metric|
-        delta = metric - @old_state[service]
 
-        report(
-          :service => "diskstats " + service,
-          :metric => (delta.to_f / opts[:interval]),
-          :state => "ok"
-        )
+        if service =~ /io reqs$/
+          report(
+            :service => "diskstats " + service,
+            :metric => metric,
+            :state => "ok"
+          )
+        else
+          delta = metric - @old_state[service]
+
+          report(
+            :service => "diskstats " + service,
+            :metric => (delta.to_f / opts[:interval]),
+            :state => "ok"
+          )
+        end
 
         if service =~ /io time$/
           report(:service => "diskstats " + service.gsub(/time/, 'util'),

data/bin/riemann-elasticsearch

@@ -11,6 +11,7 @@ class Riemann::Tools::Elasticsearch
 
   opt :read_timeout, 'Faraday read timeout', type: :int, default: 2
   opt :open_timeout, 'Faraday open timeout', type: :int, default: 1
+  opt :path_prefix, 'Elasticsearch path prefix for proxied installations e.g. "els" for target http://localhost/els/_cluster/health', default: "/"
   opt :es_host, 'Elasticsearch host', default: "localhost"
   opt :es_port, 'Elasticsearch port', type: :int, default: 9200
 
@@ -36,7 +37,10 @@ class Riemann::Tools::Elasticsearch
   end
 
   def health_url
-    "http://#{options[:es_host]}:#{options[:es_port]}/_cluster/health"
+    path_prefix = options[:path_prefix]
+    path_prefix[0] = '' if path_prefix[0]=='/'
+    path_prefix[path_prefix.length-1] = '' if path_prefix[path_prefix.length-1]=='/'
+    "http://#{options[:es_host]}:#{options[:es_port]}#{path_prefix.length>0?'/':''}#{path_prefix}/_cluster/health"
   end
 
   def tick

data/bin/riemann-freeswitch

@@ -65,6 +65,8 @@ class Riemann::Tools::FreeSWITCH
       fs_pid = -666
     end
 
+    fs_threads = fs_pid > 0 ? %x[ps huH p #{fs_pid} | wc -l].to_i : 0
+
     # Submit calls to riemann
     if fs_calls > @limits[:calls][:critical]
       alert "FreeSWITCH current calls", :critical, fs_calls, "Number of calls are #{fs_calls}"
@@ -92,6 +94,11 @@ class Riemann::Tools::FreeSWITCH
       alert "FreeSWITCH current conferences", :ok, fs_conferences, "Number of conferences are #{fs_conferences}"
     end
 
+    # Submit threads to riemann
+    if fs_threads
+      alert "FreeSWITCH current threads", :ok, fs_threads, "Number of threads are #{fs_threads}"
+    end
+
     # Submit status to riemann
     if dead_proc?(fs_pid)
       alert "FreeSWITCH status", :critical, -1, "FreeSWITCH service status: not running"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client