check_graphite 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f32d43d3f59664a0564f37e8df80b67d55a5226
-  data.tar.gz: 372374a809d7a7a116195433d33d960e704dd374
+  metadata.gz: 603d1010785574e54ebb2353fd075ab503c17a96
+  data.tar.gz: fd8419b57ca05f96d2606b6b585a1e733a910dd9
 SHA512:
-  metadata.gz: a8bf5155f627b0047aa35879786415b6f762fe813a33559f4540a335483a8d4ebdef47eaa9798b909d6f03b0b7fbb0231a30715e1a0948fda6e3d459efa75201
-  data.tar.gz: 21b34042f300ad2ba40fcf38be2b14b0688dd6761d54500e73e2eb4cc524a1f2e34474e596342246a29a46a4ec5bcf1770c09e3db83a4b53bcf5de0ef829fe8b
+  metadata.gz: 0c8b40d62478a0be9fcea816746b1943b5b5b178ad39f73e96412354f7afd30c71ef832f6fef26f0c4e447ef4d11e61a9f1351bc13bbb6b8b5360f1bfb33a6ff
+  data.tar.gz: 58e4a59d104d66124ef651ad802642beaaf7d30c44c9e83a6b96962d190c2c9e2f61d53d26ad44a3b0f6d8f213a0a059ab179f4b6c36f2283ec941ff156774dc

data/README.md

@@ -26,6 +26,7 @@ check_graphite accepts the following options:
 ## How it works
 
 check_graphite, asks for a small window of metrics, and computes an average over the last valid
-points collected, it then checks the value against supplied thresholds.
+points collected, it then checks the value against supplied thresholds. Thresholds are expressed
+in the format given in [The Nagios Developer Guidelines](http://nagiosplug.sourceforge.net/developer-guidelines.html#THRESHOLDFORMAT).
 
 NaN values are not taken into account in the average

data/lib/check_graphite/version.rb

@@ -1,3 +1,3 @@
 module CheckGraphite
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/lib/check_graphite.rb

@@ -1,6 +1,6 @@
 require "nagios_check"
 require "json"
-require "net/http"
+require "net/https"
 require "check_graphite/version"
 
 module CheckGraphite
@@ -30,7 +30,7 @@ module CheckGraphite
         req.basic_auth options.username, options.password
       end
 
-      res = Net::HTTP.start(uri.host, uri.port) { |http|
+      res = Net::HTTP.start(uri.host, uri.port, :use_ssl => 'https' == uri.scheme) { |http|
         http.request(req)
       }
 
@@ -42,11 +42,12 @@ module CheckGraphite
         options.dropfirst,
         (datapoints.size - options.dropfirst - options.droplast)
       )
-      datapoints.reject! { |v| v.first.nil? }
-      sum = datapoints.reduce(0.0) {|acc, v| acc + v.first }
 
-      raise "no valid datapoints" if res[:count] == 0
+      # Remove NULL values. Return UNKNOWN if there's nothing left.
+      datapoints.reject! { |v| v.first.nil? }
+      raise "no valid datapoints" if datapoints.size == 0
 
+      sum = datapoints.reduce(0.0) {|acc, v| acc + v.first }
       value = sum / datapoints.size
       store_value options.name, value
       store_message "#{options.name}=#{value}"

data/spec/check_graphite_spec.rb

@@ -73,7 +73,7 @@ describe CheckGraphite::Command do
     end
   end
 
-  describe "when Graphite returns no datapoints" do
+  describe "when Graphite returns no data at all" do
     before do
       FakeWeb.register_uri(:get, "http://your.graphite.host/render?target=value.does.not.exist&from=-30seconds&format=json",
                            :body => '[]',
@@ -88,6 +88,21 @@ describe CheckGraphite::Command do
     end
   end
 
+  describe "when Graphite returns only NULL values" do
+    before do
+      FakeWeb.register_uri(:get, "http://your.graphite.host/render?target=all.values.null&from=-30seconds&format=json",
+                           :body => '[{"target": "all.values.null", "datapoints": [[null, 1339512060], [null, 1339512120], [null, 1339512180], [null, 1339512240]]}]',
+                           :content_type => "application/json")
+    end
+
+    it "should be unknown" do
+      ARGV = %w{ -H http://your.graphite.host/render -M all.values.null }
+      c = CheckGraphite::Command.new
+      STDOUT.should_receive(:puts).with(/UNKNOWN: INTERNAL ERROR: (RuntimeError: )?no valid datapoints/)
+      lambda { c.run }.should raise_error SystemExit
+    end
+  end
+
   describe "it should make http requests with basic auth and return data" do
     before do
       FakeWeb.register_uri(:get, "http://baduser:badpass@your.graphite.host/render?target=collectd.somebox.load.load.midterm&from=-30seconds&format=json",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: check_graphite
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Pierre-Yves Ritschard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nagios_check