check_graphite 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7313494817c203061b8c0e7627d477f7b3bf3f91
-  data.tar.gz: 13d5de392c193c0d646dc60b96f8b6c52a402d7b
+  metadata.gz: 005e6702df11c50c976336ec6be597223b58ce83
+  data.tar.gz: 0854e7caea66b0b5a9cca85007a7161b09fcdf35
 SHA512:
-  metadata.gz: 29a569254d2894eb67691e8afdf703b67d336de22847de90fdf2ee6a1a38746495252559da63bb86eddc18d3b50b2af4cd2819702b330f99b9ed4f40be442b9e
-  data.tar.gz: 2ff72eb649135308850acff80194dffb4cd0a0df7c0245c1cdc28dd2abae31965def2577f31ea78bb568a7f8998f7ebc314c3829665fbf0b3c66b888d6e64b81
+  metadata.gz: 07bbf563737fc2012ce3beeaa5b096e923eae62904ec39f4cb0f6cbac2e5c4d352e2a884163370c00ab5b120bcb905b63ba7ebf0c089a6c280232e6bb25a3e20
+  data.tar.gz: 890ddc5b1662aa1f841c2e7c6a158be55572a8f35de36295d9b9504cda53fc1364cabcd05394ace29e8a7c567c41f82d7fc4d7fb2283bc98af71d9e8eb639840

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.*.s??

data/.travis.yml

@@ -2,3 +2,5 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.1.6
+  - 2.2.2

data/README.md

@@ -22,6 +22,7 @@ check_graphite accepts the following options:
 * `-w`: warning threshold for the metric
 * `-c`: critical threshold for the metric
 * `-t`: timeout after which the metric should be considered unknown
+* `--ignore-missing`: return `OK` when the metric doesn't exist yet e.g. errors have not occurred
 
 ## How it works
 

data/lib/check_graphite.rb

@@ -16,6 +16,9 @@ module CheckGraphite
     on "--password PASSWORD", "-P PASSWORD"
     on "--dropfirst N", "-A N", Integer, :default => 0
     on "--droplast N", "-Z N", Integer, :default => 0
+    on "-I", "--ignore-missing", :default => false do
+        options.send("ignore-missing=", true)
+    end
 
     enable_warning
     enable_critical
@@ -35,7 +38,15 @@ module CheckGraphite
       }
 
       raise "HTTP error code #{res.code}" unless res.code == "200"
-      raise "no data returned for target" if res.body == "[]"
+      if res.body == "[]"
+        if options.send("ignore-missing")
+          store_value options.name, -1
+          store_message "#{options.name} missing - ignoring"
+          return
+        else
+          raise "no data returned for target"
+        end
+      end
 
       datapoints = JSON(res.body).map { |e| e["datapoints"] }.reduce { |a, b| a + b }
       datapoints = datapoints.slice(

data/lib/check_graphite/version.rb

@@ -1,3 +1,3 @@
 module CheckGraphite
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/check_graphite_spec.rb

@@ -16,42 +16,42 @@ describe CheckGraphite::Command do
     end
 
     it "should return OK" do
-      ARGV = %w{ -H http://your.graphite.host/render -M collectd.somebox.load.load.midterm }
+      stub_const("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=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 }
+      stub_const("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 return CRITICAL" do
-      ARGV = %w{ -H http://your.graphite.host/render -M collectd.somebox.load.load.midterm -c 0 }
+      stub_const("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=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 }
+      stub_const("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 }
+      stub_const("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 }
+      stub_const("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
@@ -66,7 +66,7 @@ describe CheckGraphite::Command do
     end
 
     it "should discard them" do
-      ARGV = %w{ -H http://your.graphite.host/render -M collectd.somebox.load.load.midterm }
+      stub_const("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
@@ -81,11 +81,18 @@ describe CheckGraphite::Command do
     end
 
     it "should be unknown" do
-      ARGV = %w{ -H http://your.graphite.host/render -M value.does.not.exist }
+      stub_const("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
+
+    it "should be ok when ignoring missing data" do
+      stub_const("ARGV", %w{ -H http://your.graphite.host/render -M value.does.not.exist --ignore-missing })
+      c = CheckGraphite::Command.new
+      STDOUT.should_receive(:puts).with(/OK: value missing - ignoring/)
+      lambda { c.run }.should raise_error SystemExit
+    end
   end
 
   describe "when Graphite returns only NULL values" do
@@ -96,7 +103,7 @@ describe CheckGraphite::Command do
     end
 
     it "should be unknown" do
-      ARGV = %w{ -H http://your.graphite.host/render -M all.values.null }
+      stub_const("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
@@ -111,7 +118,7 @@ describe CheckGraphite::Command do
     end
 
     it "should return OK" do
-      ARGV = %w{ -H http://your.graphite.host/render -M collectd.somebox*.load.load.midterm }
+      stub_const("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=4.0|value=4.0;;;;")
       lambda { c.run }.should raise_error SystemExit
@@ -129,14 +136,14 @@ describe CheckGraphite::Command do
     end
 
     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}
+      stub_const("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|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 }
+      stub_const("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: (RuntimeError: )?HTTP error code 401/)
       lambda { c.run }.should raise_error SystemExit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: check_graphite
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Pierre-Yves Ritschard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nagios_check
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: check_graphite
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: check_graphite