sensu-plugins-influxdb-q 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b7059d174d108584e0f38ab72f78c75d69f53b9
-  data.tar.gz: 1ec6c04c7dc24ef1f72b80b9f9753d47780ba832
+  metadata.gz: 6e650968fffac29cb93668649219d88c11010a53
+  data.tar.gz: a15f03566144a6e6eba9ba7433f8ded3cee56b57
 SHA512:
-  metadata.gz: 768c35b38aa6dcb0d498c1a0a3713833200430631e558f2b645a3b6df3c4a3dba14c48e06a2fc6577cffeb33eab4cf5c6a6dc6840a4ee00a7e63005e1af65667
-  data.tar.gz: 6a398275e80392f80597439bab0dc1d63e11ae99242953cf11c7123c402bb9e97854cf22b8b26ba40fbc97e342ac59c30093ae13e7ca20911604120111e12b9a
+  metadata.gz: 6737956edaf435950c5ccef0d4cac958a38be02586634868732e545cab8f84a3e550e935a51b6817dafabcd52758d6a263d185d27f06ef438cccc04d35305fd8
+  data.tar.gz: e53267e4e3890564d0400b54e7ae0bc36508bb9677828fe33580b6a5ba34ffe4ede05dd27b0e44d2b570f63adf6b29887d2a7ac4fc6458178a10b47e9fd6c385

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## Unreleased
 
+## [0.0.4] - 2016-01-08
+### Added
+- Made --json-path optional and got rid of --debug
+
 ## [0.0.3] - 2016-01-08
 ### Added
 - Reverted back to source

data/README.md

@@ -19,11 +19,10 @@ Usage: check-influxdb-q.rb (options)
         --check-name <CHECK_NAME>    Check name (default: %{name}-%{tags.instance}-%{tags.type})
     -c, --crit <EXPR>                Critical expression (e.g. value >= 10)
         --database <DATABASE>        InfluxDB database (default: collectd)
-        --debug                      Enable debug mode
         --dryrun                     Do not send events to sensu client socket
         --host <HOST>                InfluxDB host (default: localhost)
         --host-field <FIELD>         InfluxDB measurement host field (default: host)
-    -j, --json-path <PATH>           JSON path for value matching (docs at http://goessner.net/articles/JsonPath) (required)
+    -j, --json-path <PATH>           JSON path for value matching (docs at http://goessner.net/articles/JsonPath)
     -m, --msg <MESSAGE>              Message to use for OK/WARNING/CRITICAL, supports variable interpolation (e.g. %{tags.instance}) (required)
         --port <PORT>                InfluxDB port (default: 8086)
     -q, --query <QUERY>              Query to execute [e.g. SELECT DERIVATIVE(LAST(value), 1m) AS value FROM interface_rx WHERE type = 'if_errors' AND time > now() - 5m group by time(1m), instance, type fill(none)] (required)
@@ -42,7 +41,7 @@ check-influxdb-q.rb -q "SELECT DERIVATIVE(LAST(value), 1m) AS value FROM interfa
 
 An handy feature is the ability to interpolate the query result hash attributes into the --check-name and --msg command line flags.
 
-So, for query above the result might look like the following (run with --debug to inspect the result):
+So, for query above the result might look like the following (run without --json-path to inspect the result):
 
 ```
 {"name"=>"interface_rx", "tags"=>{"instance"=>"ens255f0", "type"=>"if_errors"}, "values"=>[{"time"=>"2016-01-07T21:43:00Z", "value"=>0}, {"time"=>"2016-01-07T21:44:00Z", "value"=>0}, {"time"=>"2016-01-07T21:45:00Z", "value"=>0}, {"time"=>"2016-01-07T21:46:00Z", "value"=>0}, {"time"=>"2016-01-07T21:47:00Z", "value"=>0}]}

data/bin/check-influxdb-q.rb

@@ -45,7 +45,7 @@ class CheckInfluxDbQ < Sensu::Plugin::Check::CLI
          :description => "JSON path for value matching (docs at http://goessner.net/articles/JsonPath)",
          :short => "-j <PATH>",
          :long => "--json-path <PATH>",
-         :required => true
+         :default => nil
 
   option :check_name,
          :description => "Check name (default: %{name}-%{tags.instance}-%{tags.type})",
@@ -97,12 +97,6 @@ class CheckInfluxDbQ < Sensu::Plugin::Check::CLI
          :long => "--crit <EXPR>",
          :default => nil
 
-  option :debug,
-         :description => "Enable debug mode",
-         :long => "--debug",
-         :boolean => true,
-         :default => false
-
   option :dryrun,
          :description => "Do not send events to sensu client socket",
          :long => "--dryrun",
@@ -120,7 +114,11 @@ class CheckInfluxDbQ < Sensu::Plugin::Check::CLI
     }
 
     @calculator = Dentaku::Calculator.new
-    @json_path = JsonPath.new(config[:json_path])
+    if config[:json_path]
+      @json_path = JsonPath.new(config[:json_path])
+    else
+      @json_path = nil
+    end
     @influxdb = InfluxDB::Client.new(cfg)
 
     # get list of hosts
@@ -192,31 +190,34 @@ class CheckInfluxDbQ < Sensu::Plugin::Check::CLI
 
     @clients.each do |client|
       query = config[:query].gsub(" WHERE ", " WHERE #{config[:host_field]} = '#{client}' AND ")
-      puts "* Query: #{query.inspect}" if config[:debug]
       begin
         records = @influxdb.query(query)
         records.each do |record|
-          puts "    - Result: #{record.inspect}" if config[:debug]
-
-          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]})")
+          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_ok(check_name, client, "#{msg} - Value: #{value}")
+              send_unknown(check_name, client, "#{msg} - Value: N/A")
             end
           else
-            send_unknown(check_name, client, "#{msg} - Value: N/A")
+            puts "InfluxDB query [#{query}] held the following result (use --json-path to retrieve a single value)"
+            puts
+            puts JSON.pretty_generate(record)
+            puts
           end
         end
-        puts if config[:debug]
       rescue
         STDERR.puts($!)
         problems += 1

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-influxdb-q
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Matteo Cerutti