sensu-plugins-influxdb 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9274a7f429a5773b2b87785eb228d28732f870ba
-  data.tar.gz: 181b6d9c4d45098cfe3a9d5d2ac479b69da97b09
+  metadata.gz: b2755c6881b5d17f0b2822ba142c16cc17f66814
+  data.tar.gz: c83c9e82c43df31971c5563d931d39da5bdb963f
 SHA512:
-  metadata.gz: 9e2825358b70d0459f0a51362dce642f3869135fb720a353b7d7f83c65ff6cfb1b96928c45f3eee13576b596207e9a0c0b5d70da16a6714dbc91ab8480fad6bc
-  data.tar.gz: 615ebd06c4d6ee7365689df7f16e72777af450e2dd021ea9eae4227a7ce840c02478b54837bb173a541acafafad711b3d610f5c0b0a70396bedf53bd9b53488c
+  metadata.gz: 79601be694e72ef79fa0502fce855c934aa1d513f965f6e1bbfb5959a857b97688478d4818d464672672dc31293a00bbf4ed2b3bd86bd5cf95411ce94d6a39cb
+  data.tar.gz: 7b44ccc30a4a39f27fe52787fde63cfafe8dee901d79c1bb5d0c9678b4f21b2c8530636b3c3b960e253f552c84ac00cd077f0d017ac9bb1b45ff1b0eae4a074e

data/CHANGELOG.md

@@ -4,10 +4,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+## [1.2.0] - 2017-05-15
+- Added "mode" into check-influxdb-query check to allow multiple values in a query
 
 ## [1.1.0] - 2016-12-01
 ### Added
-- Added tags support for mutator-influxdb-line-protocol.rb 
+- Added tags support for mutator-influxdb-line-protocol.rb
 - Added retry support for check-influxdb-query.rb - The InfluxDB gem by default retries indefinitely and will cause the query to hang.  A retry of 12 will retry for approx 37 seconds.
 
 ### Changed
@@ -66,7 +68,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-influxdb/compare/1.1.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-influxdb/compare/1.2.0...HEAD
+[1.2.0]: https://github.com/sensu-plugins/sensu-plugins-influxdb/compare/1.1.0...1.2.0
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-influxdb/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-influxdb/compare/0.0.7...1.0.0
 [0.0.7]: https://github.com/sensu-plugins/sensu-plugins-influxdb/compare/0.0.6...0.0.7

data/README.md

@@ -15,7 +15,7 @@
  * bin/mutator-influxdb-line-protocol.rb 
 
 ## Usage - metrics-influxdb.rb
-Add the following to `/etc/sensu/conf.d/influx.conf` "plugin expects `influxdb` to be a top level node in the json
+Add the following to `/etc/sensu/conf.d/influx.json` "plugin expects `influxdb` to be a top level node in the json
 **metrics-influxdb**
 ```
 {
@@ -43,7 +43,7 @@ Add the following to `/etc/sensu/conf.d/influx.conf` "plugin expects `influxdb`
     }
 }
 ```
-Then add the following to your `/ect/sensu/conf.d/handlers.conf`:
+Then add the following to your `/etc/sensu/conf.d/handlers.json`:
 ```
 {
   "handlers": {
@@ -60,7 +60,7 @@ Setting "status" to true will store the metric using the status as the value and
 ## Usage - mutator-influxdb-line-protocol.rb
 Add the mutator-influxdb-line-protocol.rb file into /etc/sensu/extensions/
 
-Then add the following to your `/ect/sensu/conf.d/handlers.conf`:
+Then add the following to your `/etc/sensu/conf.d/handlers.json`:
 ```
 {
   "handlers": {
@@ -70,7 +70,7 @@ Then add the following to your `/ect/sensu/conf.d/handlers.conf`:
         "host": "localhost",
         "port": 8090
       },
-      "mutator": "influxdb_line_protocol",
+      "mutator": "influxdb_line_protocol"
     }
   }
 }
@@ -94,7 +94,7 @@ To ship additional tags to your metrics via mutator-influxdb-line-protocol.rb (o
       "type": "metric",
       "standalone": false,
       "tags": {
-        "group": "operations",
+        "group": "operations"
       }
     }
   }

data/bin/check-influxdb-query.rb

@@ -110,6 +110,12 @@ class CheckInfluxdbQuery < Sensu::Plugin::Check::CLI
          default: nil,
          description: 'Alias of query (e.g. if query and output gets too long)'
 
+  option :mode,
+         short: '-m MODE',
+         long: '--mode MODE',
+         default: 'first',
+         description: 'How the results are being checked (one of "first", "last", "max", "min", "avg") when the query returns more than one value'
+
   option :jsonpath,
          short: '-j JSONPATH',
          long: '--jsonpath JSONPATH',
@@ -179,19 +185,45 @@ class CheckInfluxdbQuery < Sensu::Plugin::Check::CLI
 
     if config[:jsonpath]
       json_path = JsonPath.new(config[:jsonpath])
-      value = json_path.on(value).first || 0
-
       calc = Dentaku::Calculator.new
-      if config[:critical] && calc.evaluate(config[:critical], value: value)
-        critical "Value '#{value}' matched '#{config[:critical]}' for query '#{query_name}'"
-      elsif config[:warning] && calc.evaluate(config[:warning], value: value)
-        warning "Value '#{value}' matched '#{config[:warning]}' for query '#{query_name}'"
+      if config[:mode] == 'any' && json_path.on(value).length >= 1
+        json_path.on(value).each do |hashval|
+          if config[:critical] && calc.evaluate(config[:critical], value: hashval)
+            critical "Value '#{value}' matched '#{config[:critical]}' for query '#{query_name}'"
+          elsif config[:warning] && calc.evaluate(config[:warning], value: hashval)
+            warning "Value '#{value}' matched '#{config[:warning]}' for query '#{query_name}'"
+          end
+        end
+        ok 'All values OK!'
       else
-        ok "Value '#{value}' ok for query '#{query_name}'"
+        value = get_single_value(json_path, value)
+        if config[:critical] && calc.evaluate(config[:critical], value: value)
+          critical "Value '#{value}' matched '#{config[:critical]}' for query '#{query_name}'"
+        elsif config[:warning] && calc.evaluate(config[:warning], value: value)
+          warning "Value '#{value}' matched '#{config[:warning]}' for query '#{query_name}'"
+        else
+          ok "Value '#{value}' ok for query '#{query_name}'"
+        end
       end
     else
       puts 'Debug output. Use -j to check value...'
       puts JSON.pretty_generate(value)
     end
   end
+
+  def get_single_value(jpath, value)
+    return 0 if jpath.on(value).empty?
+    case config[:mode]
+    when 'last'
+      jpath.on(value).last
+    when 'min'
+      jpath.on(value).min
+    when 'max'
+      jpath.on(value).max
+    when 'avg', 'average'
+      jpath.on(value).inject(:+).to_f / jpath.on(value).length
+    else
+      jpath.on(value).first
+    end
+  end
 end

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

@@ -1,7 +1,7 @@
 module SensuPluginsInfluxdb
   module Version
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-influxdb
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dentaku