sensu-plugins-influxdb-q 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6b5da9f248b5432ea5fb9f30966302969cac98f
-  data.tar.gz: 0f1be2928fb827a91d75756aa849a4aca8838286
+  metadata.gz: aa4effaf4b971f17d0624a2ad4283e1ca4648ae3
+  data.tar.gz: 47ae909be1bf11062607eb23f9abff7756731884
 SHA512:
-  metadata.gz: f902b27a27d42352afda39341b342583ef421ac4e54b38dfe9c7f9c15b62139f43345562988cf4ea1eb1455578f018692dd3a1c398ae6b4eeb1ff7df97f6a16f
-  data.tar.gz: 4f71cb80f64a3db72af54f5425972f3545a34cc15e536bcd1e7889d9e4d2bc6ae567f0ca8765a897085241bebd9d93dc735142071a36f44331392447e69f54ce
+  metadata.gz: fab571e87cc6f69abc25dc221de8f87d8da88a7e15ceb6a7e36764bae322e62a9ab966b85c71f10653844ef15b39ff7639adf826e7eaef63a04931ae3267f393
+  data.tar.gz: 4beb7592325166c1b051eb36d7f1b05af52753e1c04e4286818abce3428059bf319db6a372d29e9846fb7548a3af0319562f1493f9f244f35088257b6614c67e

data/CHANGELOG.md

@@ -3,7 +3,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
-## Unreleased
+## [0.0.6] - 2016-01-18
+### Added
+- Added query timeout option
 
 ## [0.0.5] - 2016-01-14
 ### Added
@@ -24,3 +26,5 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ## [0.0.1] - 2016-01-07
 ### Added
 - Initial release
+
+## Unreleased

data/bin/check-influxdb-q.rb

@@ -14,6 +14,7 @@ require 'sensu-plugin/check/cli'
 require 'influxdb'
 require 'jsonpath'
 require 'dentaku'
+require 'timeout'
 
 class Hash
   def symbolize_recursive
@@ -80,6 +81,12 @@ class CheckInfluxDbQ < Sensu::Plugin::Check::CLI
          :default => false,
          :boolean => true
 
+  option :timeout,
+         :description => "InfluxDB query timeout (default: 3)",
+         :long => "--timeout <SECONDS>",
+         :proc => proc { |i| i.to_i },
+         :default => 3
+
   option :host_field,
          :description => "InfluxDB measurement host field (default: host)",
          :long => "--host-field <FIELD>",
@@ -197,35 +204,42 @@ class CheckInfluxDbQ < Sensu::Plugin::Check::CLI
     @clients.each do |client|
       query = config[:query].gsub(" WHERE ", " WHERE #{config[:host_field]} = '#{client}' AND ")
       begin
-        records = @influxdb.query(query)
-        records.each do |record|
-          if @json_path
-            value = @json_path.on(record).first
-
-            record_s = record.symbolize_recursive
-            check_name = "influxdb-q-#{interpolate(config[:check_name], record_s)}"
-            msg = interpolate(config[:msg], record_s)
-
-            if value != nil
-              if config[:crit] and @calculator.evaluate(config[:crit], value: value)
-                send_critical(check_name, client, "#{msg} - Value: #{value} (#{config[:crit]})")
-              elsif config[:warn] and @calculator.evaluate(config[:warn], value: value)
-                send_warning(check_name, client, "#{msg} - Value: #{value} (#{config[:warn]})")
+        timeout(config[:timeout) do
+          begin
+            records = @influxdb.query(query)
+            records.each do |record|
+              if @json_path
+                value = @json_path.on(record).first
+
+                record_s = record.symbolize_recursive
+                check_name = "influxdb-q-#{interpolate(config[:check_name], record_s)}"
+                msg = interpolate(config[:msg], record_s)
+
+                if value != nil
+                  if config[:crit] and @calculator.evaluate(config[:crit], value: value)
+                    send_critical(check_name, client, "#{msg} - Value: #{value} (#{config[:crit]})")
+                  elsif config[:warn] and @calculator.evaluate(config[:warn], value: value)
+                    send_warning(check_name, client, "#{msg} - Value: #{value} (#{config[:warn]})")
+                  else
+                    send_ok(check_name, client, "#{msg} - Value: #{value}")
+                  end
+                else
+                  send_unknown(check_name, client, "#{msg} - Value: N/A")
+                end
               else
-                send_ok(check_name, client, "#{msg} - Value: #{value}")
+                puts "InfluxDB query [#{query}] held the following result (use --json-path to retrieve a single value)"
+                puts
+                puts JSON.pretty_generate(record)
+                puts
               end
-            else
-              send_unknown(check_name, client, "#{msg} - Value: N/A")
             end
-          else
-            puts "InfluxDB query [#{query}] held the following result (use --json-path to retrieve a single value)"
-            puts
-            puts JSON.pretty_generate(record)
-            puts
+          rescue
+            STDERR.puts($!)
+            problems += 1
           end
         end
-      rescue
-        STDERR.puts($!)
+      rescue Timeout::Error
+        STDERR.puts("InfluxDB query [#{query}] timed out")
         problems += 1
       end
     end

data/lib/sensu-plugins-influxdb-q/version.rb

@@ -2,7 +2,7 @@ module SensuPluginsInfluxDbQ
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 5
+    PATCH = 6
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-influxdb-q
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Matteo Cerutti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin