icinga-rest 0.1.0 → 0.1.1

data/Gemfile

@@ -1,5 +1,6 @@
 source :rubygems
 gem "json"
+gem "addressable"
 group :development do
   gem "ruby-debug"
   gem "rdoc"

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.6)
     columnize (0.3.2)
     diff-lcs (1.1.3)
     gem-this (0.3.7)
@@ -25,6 +26,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  addressable
   gem-this
   json
   rdoc

data/Rakefile

@@ -29,7 +29,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "icinga-rest"
-  s.version           = "0.1.0"
+  s.version           = "0.1.1"
   s.summary           = "Simple, basic access to the Icinga REST API"
   s.author            = "David Salgado"
   s.email             = "david@digitalronin.com"
@@ -49,6 +49,7 @@ spec = Gem::Specification.new do |s|
   # If you want to depend on other gems, add them here, along with any
   # relevant versions
   s.add_dependency("json")
+  s.add_dependency("addressable")
 
   # If your tests use any gems, include them here
   s.add_development_dependency("rspec")

data/Readme.markdown

@@ -28,10 +28,6 @@ Requirements
 
 You must have enabled the REST API on your Icinga server (and configured the hosts and services to be monitored, of course)
 
-Any box that runs this check will need the wget program in /usr/bin/wget
-
-wget is used instead of a nice ruby http library because the URLs to access the Icinga REST API are not valid http URLs, so all the libraries I tried barf on them. wget is more forgiving.
-
 MIT License
 ===========
 

data/lib/icinga_rest.rb

@@ -4,6 +4,8 @@ end
 
 require 'rubygems'
 require 'json'
+require 'net/http'
+require 'addressable/uri'
 
 libdir = File.join(File.dirname(__FILE__), 'icinga_rest')
 

data/lib/icinga_rest/request.rb

@@ -8,8 +8,6 @@ class IcingaRest::Request
                 :count_column, # count this column to produce the total
                 :output        # json|xml
 
-  WGET = '/usr/bin/wget'
-
   def initialize(params)
     @host         = params[:host]
     @target       = params[:target]
@@ -19,13 +17,13 @@ class IcingaRest::Request
     @output       = params[:output]
   end
 
-  # It would be nicer to use Net::HTTP, or something, but the 
-  # URLs required by the Icinga API are not well-formed, and 
-  # the URI library, used by most of the ruby http libs, barfs.
-  # So, we shell out to wget, which is more tolerant.
-  # Fugly, but functional.
+  # The standard URI library blows up with the malformed URLs
+  # required to access the Icinga REST API, but addressable
+  # works fine.
   def get
-    `#{WGET} -q -O - '#{to_url}'`
+    uri = Addressable::URI.parse to_url
+    r = Net::HTTP.get_response uri.normalize
+    r.code == '200' ? r.body : ''
   end
 
   def to_url

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: icinga-rest
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - David Salgado
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-08 00:00:00 Z
+date: 2011-10-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -32,7 +32,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: addressable
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -43,10 +43,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -59,6 +59,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Use the Icinga REST API to count hosts with services in a given state
 email: david@digitalronin.com
 executables: []