sensu-plugins-influxdb-q 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d24cae40e61200c0f3fbc7007498f0a3eedaf04
-  data.tar.gz: 4c611a05196d5f388fb03f5dbb467d57b3f4893b
+  metadata.gz: a207bedffba13414bbd4291fcbbd5af979e0b61a
+  data.tar.gz: 5be5fd44bb84c35f31180541542eea43031c25bc
 SHA512:
-  metadata.gz: 6ecd6223a8bdb04a03a4ef6f428c371b421fab02dc172b39f14694c8d03f66f016ed23ff69b2acd850d1a3afad5fcad1f4d08d4dfa35ab4584218650023c111e
-  data.tar.gz: afeca730f93429da2ae027ee0b521ea4dbeb06ed75ce197b7ff0bc2b2bfab5df5d8fe52c3bf1e09c59fa361017b14e1851ce23cbd0dc81f8c31cad54078d16bc
+  metadata.gz: c5f53e431be469a13b8099cdf168d633cff22516790cbc35f977ea9c0a9bd81ab648c2750809cd9faffb6a97b957c9ca05c5d803aaca3d2ec292214717ab7b82
+  data.tar.gz: 1ea90d9ec7b02e92ff60c5ac25610eac14f8ffa8ba51e44b36f68cb2cd804a516598cf8b1e92f9e1b4ef1db2a555375124404c6935c0f7a4b904044eaae7d679

data/CHANGELOG.md

@@ -3,6 +3,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
+## [0.0.9] - 2016-01-18
+### Added
+- Not filtering by sensu clients anymore
+
 ## [0.0.8] - 2016-01-18
 ### Added
 - Not filtering by sensu clients anymore

data/bin/check-influxdb-q.rb

@@ -92,12 +92,6 @@ class CheckInfluxDbQ < Sensu::Plugin::Check::CLI
          :long => "--host-field <FIELD>",
          :default => "host"
 
-  option :only_sensu_clients,
-         :description => "Only consider measurements of known sensu clients",
-         :long => "--only-sensu-clients",
-         :boolean => true
-         :default => false
-
   option :handlers,
          :description => "Comma separated list of handlers",
          :long => "--handlers <HANDLER>",
@@ -139,9 +133,6 @@ class CheckInfluxDbQ < Sensu::Plugin::Check::CLI
       @json_path = nil
     end
     @influxdb = InfluxDB::Client.new(cfg)
-
-    # get list of hosts
-    @clients = get_clients()
   end
 
   def send_client_socket(data)
@@ -190,34 +181,15 @@ class CheckInfluxDbQ < Sensu::Plugin::Check::CLI
     string.gsub(/%\{([^\}]*)\}/).each { |match| match[/^%{(.*)}$/, 1].split('.').inject(hash) { |h, k| h[(k.to_s == k.to_i.to_s) ? k.to_i : k.to_sym] } }
   end
 
-  def get_clients()
-    clients = []
-
-    if req = api_request(:GET, "/clients")
-      if req.code == '200'
-        JSON.parse(req.body).each do |client|
-          clients << client['name']
-        end
-      end
-    end
-
-    clients
-  end
-
   def run()
-    problems = 0
-
     begin
       timeout(config[:timeout]) do
         begin
-          records = @influxdb.query(query)
+          records = @influxdb.query(config[:query])
           if records.size > 0
             records.each do |record|
-              if record.has_key?(config[:host_field])
-                client = record[config[:host_field]]
-
-                # skip client if it's not already known by Sensu
-                next if config[:only_sensu_clients] and ! @clients.include?(client)
+              if record['tags'].has_key?(config[:host_field])
+                client = record['tags'][config[:host_field]]
               else
                 client = nil
               end
@@ -241,21 +213,21 @@ class CheckInfluxDbQ < Sensu::Plugin::Check::CLI
                   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 "InfluxDB query [#{config[:query]}] held the following result (use --json-path to retrieve a single value)"
                 puts
                 puts JSON.pretty_generate(record)
                 puts
               end
             end
           else
-            unknown("InfluxDB query [#{query}] held no results")
+            unknown("InfluxDB query [#{config[:query]}] held no results")
           end
         rescue
-          critical("InfluxDB query [#{query}] failed - (#{$!})")
+          critical("InfluxDB query [#{config[:query]}] failed - (#{$!})")
         end
       end
     rescue Timeout::Error
-      unknown("InfluxDB query [#{query}] timed out")
+      unknown("InfluxDB query [#{config[:query]}] timed out")
     end
 
     ok("Query executed successfully")

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

@@ -2,7 +2,7 @@ module SensuPluginsInfluxDbQ
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 8
+    PATCH = 9
 
     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.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Matteo Cerutti