check_graphite 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3f32d43d3f59664a0564f37e8df80b67d55a5226
+  data.tar.gz: 372374a809d7a7a116195433d33d960e704dd374
+SHA512:
+  metadata.gz: a8bf5155f627b0047aa35879786415b6f762fe813a33559f4540a335483a8d4ebdef47eaa9798b909d6f03b0b7fbb0231a30715e1a0948fda6e3d459efa75201
+  data.tar.gz: 21b34042f300ad2ba40fcf38be2b14b0688dd6761d54500e73e2eb4cc524a1f2e34474e596342246a29a46a4ec5bcf1770c09e3db83a4b53bcf5de0ef829fe8b

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3

data/README.md

@@ -1,5 +1,9 @@
 check_graphite is a nagios module to query graphite
 
+[![Build
+Status](https://secure.travis-ci.org/pyr/check-graphite.png)](http://travis-ci.org/pyr/check-graphite)
+
+
 ## Example
 
 check_graphite -H 'http://my.graphite.host

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+desc "Default: run specs."
+task :default => :spec
+
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = "--color"
+end

data/check_graphite.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   # s.add_development_dependency "rspec"
   s.add_runtime_dependency "nagios_check"
 
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "fakeweb"
 end

data/lib/check_graphite.rb

@@ -34,20 +34,20 @@ module CheckGraphite
         http.request(req)
       }
 
-      res.code == "200" || raise("HTTP error code #{res.code}")
+      raise "HTTP error code #{res.code}" unless res.code == "200"
+      raise "no data returned for target" if res.body == "[]"
 
       datapoints = JSON(res.body).first["datapoints"]
-      res = datapoints.drop(options.dropfirst).
-                      take(datapoints.length - options.dropfirst - options.droplast).
-                      reduce({:sum => 0.0, :count => 0}) {|acc, e|
-        if e[0]
-          {:sum => acc[:sum] + e[0], :count => acc[:count] + 1}
-        else
-          acc
-        end
-      }
+      datapoints = datapoints.slice(
+        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
-      value = res[:sum] / res[:count]
+
+      value = sum / datapoints.size
       store_value options.name, value
       store_message "#{options.name}=#{value}"
     end

data/lib/check_graphite/version.rb

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

data/spec/check_graphite_spec.rb

@@ -11,21 +11,79 @@ describe CheckGraphite::Command do
   describe "it should make http requests and return data" do
     before do
       FakeWeb.register_uri(:get, "http://your.graphite.host/render?target=collectd.somebox.load.load.midterm&from=-30seconds&format=json",
-                           :body => '[{"target": "default.test.boottime", "datapoints": [[1.0, 1339512060], [3.0, 1339512120]]}]',
+                           :body => '[{"target": "default.test.boottime", "datapoints": [[1.0, 1339512060], [2.0, 1339512120], [6.0, 1339512180], [7.0, 1339512240]]}]',
                            :content_type => "application/json")
     end
 
-    it "should just work" do
+    it "should return OK" do
       ARGV = %w{ -H http://your.graphite.host/render -M collectd.somebox.load.load.midterm }
       c = CheckGraphite::Command.new
-      STDOUT.should_receive(:puts).with("OK|value=2.0;;;;")
+      STDOUT.should_receive(:puts).with("OK: value=4.0|value=4.0;;;;")
+      lambda { c.run }.should raise_error SystemExit
+    end
+
+    it "should return WARNING" do
+      ARGV = %w{ -H http://your.graphite.host/render -M collectd.somebox.load.load.midterm -w 0 }
+      c = CheckGraphite::Command.new
+      STDOUT.should_receive(:puts).with("WARNING: value=4.0|value=4.0;;;;")
       lambda { c.run }.should raise_error SystemExit
     end
 
-    it "should be critical" do
+    it "should return CRITICAL" do
       ARGV = %w{ -H http://your.graphite.host/render -M collectd.somebox.load.load.midterm -c 0 }
       c = CheckGraphite::Command.new
-      STDOUT.should_receive(:puts).with("CRITICAL|value=2.0;;;;")
+      STDOUT.should_receive(:puts).with("CRITICAL: value=4.0|value=4.0;;;;")
+      lambda { c.run }.should raise_error SystemExit
+    end
+
+    it "should honour dropfirst" do
+      ARGV = %w{ -H http://your.graphite.host/render -M collectd.somebox.load.load.midterm --dropfirst 1 }
+      c = CheckGraphite::Command.new
+      STDOUT.should_receive(:puts).with("OK: value=5.0|value=5.0;;;;")
+      lambda { c.run }.should raise_error SystemExit
+    end
+
+    it "should honour droplast" do
+      ARGV = %w{ -H http://your.graphite.host/render -M collectd.somebox.load.load.midterm --droplast 1 }
+      c = CheckGraphite::Command.new
+      STDOUT.should_receive(:puts).with("OK: value=3.0|value=3.0;;;;")
+      lambda { c.run }.should raise_error SystemExit
+    end
+
+    it "should honour dropfirst and droplast together" do
+      ARGV = %w{ -H http://your.graphite.host/render -M collectd.somebox.load.load.midterm --dropfirst 1 --droplast 1 }
+      c = CheckGraphite::Command.new
+      STDOUT.should_receive(:puts).with("OK: value=4.0|value=4.0;;;;")
+      lambda { c.run }.should raise_error SystemExit
+    end
+  end
+
+  describe "when data contains null values" do
+    before do
+      FakeWeb.register_uri(:get, "http://your.graphite.host/render?target=collectd.somebox.load.load.midterm&from=-30seconds&format=json",
+                           :body => '[{"target": "default.test.boottime", "datapoints": [[1.0, 1339512060], [null, 1339512120], [null, 1339512180], [3.0, 1339512240]]}]',
+                           :content_type => "application/json")
+    end
+
+    it "should discard them" do
+      ARGV = %w{ -H http://your.graphite.host/render -M collectd.somebox.load.load.midterm }
+      c = CheckGraphite::Command.new
+      STDOUT.should_receive(:puts).with("OK: value=2.0|value=2.0;;;;")
+      lambda { c.run }.should raise_error SystemExit
+    end
+  end
+
+  describe "when Graphite returns no datapoints" do
+    before do
+      FakeWeb.register_uri(:get, "http://your.graphite.host/render?target=value.does.not.exist&from=-30seconds&format=json",
+                           :body => '[]',
+                           :content_type => "application/json")
+    end
+
+    it "should be unknown" do
+      ARGV = %w{ -H http://your.graphite.host/render -M value.does.not.exist }
+      c = CheckGraphite::Command.new
+      STDOUT.should_receive(:puts).with(/UNKNOWN: INTERNAL ERROR: (RuntimeError: )?no data returned for target/)
       lambda { c.run }.should raise_error SystemExit
     end
   end
@@ -43,15 +101,15 @@ describe CheckGraphite::Command do
     it "should work with valid username and password" do
       ARGV = %w{ -H http://your.graphite.host/render -M collectd.somebox.load.load.midterm -U testuser -P testpass}
       c = CheckGraphite::Command.new
-      STDOUT.should_receive(:puts).with("OK|value=2.0;;;;")
+      STDOUT.should_receive(:puts).with("OK: value=2.0|value=2.0;;;;")
       lambda { c.run }.should raise_error SystemExit
     end
 
     it "should fail with bad username and password" do
       ARGV = %w{ -H http://your.graphite.host/render -M collectd.somebox.load.load.midterm -U baduser -P badpass }
       c = CheckGraphite::Command.new
-      STDOUT.should_receive(:puts).with(/UNKNOWN: INTERNAL ERROR: HTTP error code 401/)
+      STDOUT.should_receive(:puts).with(/UNKNOWN: INTERNAL ERROR: (RuntimeError: )?HTTP error code 401/)
       lambda { c.run }.should raise_error SystemExit
     end
   end
-end
+end

metadata

@@ -1,49 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: check_graphite
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Pierre-Yves Ritschard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nagios_check
-  requirement: &14292080 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14292080
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14266700 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14266700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &14264460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14264460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: check values from a graphite server
 email:
 - pyr@spootnik.org
@@ -53,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -63,27 +86,26 @@ files:
 - spec/check_graphite_spec.rb
 homepage: https://github.com/pyr/check-graphite
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: check_graphite
-rubygems_version: 1.8.10
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: check_graphite
 test_files:
 - spec/check_graphite_spec.rb