redphone 0.0.4 → 0.0.5

data/README.org

@@ -1,7 +1,10 @@
 * Redphone, the monitoring service ruby library
   - Pagerduty support (integration, incidents)
-  - Loggly support (events)
+  - Pingdom support (checks, results, actions)
+  - Loggly support (event, search, facets)
   [[https://github.com/portertech/redphone/raw/master/redphone.jpg]]
+  - All API request are done over SSL
+  - Response bodies are returned as Ruby hashes
 * Getting started
   : gem install redphone
 * Examples
@@ -23,12 +26,27 @@
   : pagerduty.resolve_incident(:incident_key => "redphone/test")
   : # OR Redphone::Pagerduty.resolve_incident()
   List/query current and past incidents
-  : incidents = pagerduty.incidents(:incident_key => "redphone/test")
+  : pagerduty.incidents(:incident_key => "redphone/test")
   You can add the following options for a date range
   : :since => "2011-08-01",
   : :until => "2011-10-01"
   Or if you only care about unresolved incidents
   : :status => "triggered,acknowledged"
+** Pingdom
+  : require "redphone/pingdom"
+  : pingdom = Redphone::Pingdom.new(
+  :   :user => USER,
+  :   :password => PASSWORD
+  : )
+  Create a check
+  : response = pingdom.create_check(
+  :   :name => "redphone",
+  :   :host => "www.amazon.ca",
+  :   :type => "http"
+  : )
+  : check_id = response['check']['id']
+  Delete a check
+  : pingdom.delete_check(:id => check_id)
 ** Loggly
   : require "redphone/loggly"
   : loggly = Redphone::Loggly.new(
@@ -47,6 +65,15 @@
   : )
   : # OR Redphone::Loggly.send_event()
   Search for previous event occurrences
-  : events = loggly.search(:q => "json.service:redphone")
+  : loggly.search(:q => "json.service:redphone")
+  Faceted search results on date
+  : loggly.facets(:q => "json.service:redphone")
+  Add an option for faceted search results on input name
+  : :facet_type => "input"
+  Or on IP address
+  : :facet_type => "ip"
+  You can add the following options for a date range
+  : :from => "2011-08-01T12:00:00Z",
+  : :until => "2011-10-01T12:00:00Z"
 * Contributors
   - [[http://portertech.ca][Sean Porter]]

data/lib/redphone/helpers.rb

@@ -11,21 +11,27 @@ def http_request(options={})
   user = options[:user]
   password = options[:password]
   headers = options[:headers] || Hash.new
+  parameters = options[:parameters] || Hash.new
   body = options[:body]
   http = Net::HTTP.new(uri.host, uri.port)
   if options[:ssl] == true
     http.use_ssl = true
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
   end
+  request_uri = uri.request_uri
+  unless parameters.empty?
+    request_uri += "?"
+    request_uri += parameters.map { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
+  end
   request = case method
   when "get"
-    Net::HTTP::Get.new(uri.request_uri)
+    Net::HTTP::Get.new(request_uri)
   when "post"
-    Net::HTTP::Post.new(uri.request_uri)
+    Net::HTTP::Post.new(request_uri)
   when "put"
-    Net::HTTP::Put.new(uri.request_uri)
+    Net::HTTP::Put.new(request_uri)
   when "delete"
-    Net::HTTP::Delete.new(uri.request_uri)
+    Net::HTTP::Delete.new(request_uri)
   else
     raise "Unknown HTTP method: #{method}"
   end

data/lib/redphone/loggly.rb

@@ -3,9 +3,9 @@ require File.join(File.dirname(__FILE__), 'helpers')
 module Redphone
   class Loggly
     def initialize(options={})
-      raise "You must supply a subdomain" if options[:subdomain].nil?
-      raise "You must supply a user" if options[:user].nil?
-      raise "You must supply a password" if options[:password].nil?
+      [:subdomain, :user, :password].each do |option|
+        raise "You must supply a #{option}" if options[option].nil?
+      end
       @subdomain =  options[:subdomain]
       @user = options[:user]
       @password = options[:password]
@@ -15,12 +15,26 @@ module Redphone
 
     def search(options={})
       raise "You must supply a query string" if options[:q].nil?
-      params = options.map { |key, value| "#{key}=#{CGI.escape(value)}" }.join("&")
       response = http_request(
         :user => @user,
         :password => @password,
         :ssl => true,
-        :uri => "https://#{@subdomain}.loggly.com/api/search?#{params}"
+        :uri => "https://#{@subdomain}.loggly.com/api/search",
+        :parameters => options
+      )
+      JSON.parse(response.body)
+    end
+
+    def facets(options={})
+      raise "You must supply a query string" if options[:q].nil?
+      facet_type = options[:facet_type] || "date"
+      raise "Facet type must be date, ip, or input" if !%w[date ip input].include?(facet_type)
+      response = http_request(
+        :user => @user,
+        :password => @password,
+        :ssl => true,
+        :uri => "https://#{@subdomain}.loggly.com/api/facets/#{facet_type}/",
+        :parameters => options.reject { |key, value| key == :facet_type }
       )
       JSON.parse(response.body)
     end

data/lib/redphone/pagerduty.rb

@@ -3,9 +3,9 @@ require File.join(File.dirname(__FILE__), 'helpers')
 module Redphone
   class Pagerduty
     def initialize(options={})
-      raise "You must supply a subdomain" if options[:subdomain].nil?
-      raise "You must supply a user" if options[:user].nil?
-      raise "You must supply a password" if options[:password].nil?
+      [:subdomain, :user, :password].each do |option|
+        raise "You must supply a #{option}" if options[option].nil?
+      end
       @subdomain =  options[:subdomain]
       @user = options[:user]
       @password = options[:password]
@@ -23,8 +23,9 @@ module Redphone
     end
 
     def self.trigger_incident(options={})
-      raise "You must supply a service key" if options[:service_key].nil?
-      raise "You must supply a description" if options[:description].nil?
+      [:service_key, :description].each do |option|
+        raise "You must supply a #{option.gsub('_', ' ')}" if options[option].nil?
+      end
       request_body = options.merge!({:event_type => "trigger"})
       integration_api(request_body)
     end
@@ -35,8 +36,9 @@ module Redphone
     end
 
     def self.resolve_incident(options={})
-      raise "You must supply a service key" if options[:service_key].nil?
-      raise "You must supply a incident key" if options[:incident_key].nil?
+      [:service_key, :incident_key].each do |option|
+        raise "You must supply a #{option.gsub('_', ' ')}" if options[option].nil?
+      end
       request_body = options.merge!({:event_type => "resolve"})
       integration_api(request_body)
     end
@@ -47,12 +49,12 @@ module Redphone
     end
 
     def incidents(options={})
-      params = options.map { |key, value| "#{key}=#{CGI.escape(value)}" }.join("&")
       response = http_request(
         :user => @user,
         :password => @password,
         :ssl => true,
-        :uri => "https://#{@subdomain}.pagerduty.com/api/v1/incidents?#{params}"
+        :uri => "https://#{@subdomain}.pagerduty.com/api/v1/incidents",
+        :parameters => options
       )
       JSON.parse(response.body)
     end

data/lib/redphone/pingdom.rb

@@ -0,0 +1,72 @@
+require File.join(File.dirname(__FILE__), 'helpers')
+
+module Redphone
+  class Pingdom
+    def initialize(options={})
+      [:user, :password].each do |option|
+        raise "You must supply a #{option}" if options[option].nil?
+      end
+      @request_options = {
+        :user => options[:user],
+        :password => options[:password],
+        :ssl => true,
+        :headers => {"App-Key" => "ksectgskhysnv4wb7h0z5re2wmeqqxnd"}
+      }
+    end
+
+    def create_check(options={})
+      [:name, :host, :type].each do |option|
+        raise "You must supply a check #{option}" if options[option].nil?
+      end
+      response = http_request(
+        @request_options.merge({
+          :method => "post",
+          :uri => "https://api.pingdom.com/api/2.0/checks",
+          :parameters => options
+        })
+      )
+      JSON.parse(response.body)
+    end
+
+    def checks
+      response = response = http_request(
+        @request_options.merge({
+          :uri => "https://api.pingdom.com/api/2.0/checks"
+        })
+      )
+      JSON.parse(response.body)
+    end
+
+    def actions(options={})
+      response = http_request(
+        @request_options.merge({
+          :uri => "https://api.pingdom.com/api/2.0/actions",
+          :parameters => options
+        })
+      )
+      JSON.parse(response.body)
+    end
+
+    def results(options={})
+      raise "You must supply a check id" if options[:id].nil?
+      response = http_request(
+        @request_options.merge({
+          :uri => "https://api.pingdom.com/api/2.0/results/#{options[:id]}",
+          :parameters => options.reject { |key, value| key == :id }
+        })
+      )
+      JSON.parse(response.body)
+    end
+
+    def delete_check(options={})
+      raise "You must supply a check id" if options[:id].nil?
+      response = http_request(
+        @request_options.merge({
+          :method => "delete",
+          :uri => "https://api.pingdom.com/api/2.0/checks/#{options[:id]}"
+        })
+      )
+      JSON.parse(response.body)
+    end
+  end
+end

data/lib/redphone/version.rb

@@ -1,3 +1,3 @@
 module Redphone
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/loggly_test.rb

@@ -20,7 +20,7 @@ class TestRedphoneLoggly < MiniTest::Unit::TestCase
     )
   end
 
-  def test_send_event
+  def test_a_send_event
     response = @loggly.send_event(
       :input_key => LOGGLY_INPUT_KEY,
       :input_type => "json",
@@ -32,8 +32,16 @@ class TestRedphoneLoggly < MiniTest::Unit::TestCase
     assert_equal 'ok', response['response']
   end
 
-  def test_search
+  def test_b_search
     response = @loggly.search(:q => "json.service:redphone")
     assert response['numFound'] > 0
   end
+
+  def test_c_facets
+    response = @loggly.facets(
+      :q => "json.service:redphone",
+      :from => "2011-10-01T12:00:00Z"
+    )
+    assert response['numFound'] > 0
+  end
 end

data/test/pagerduty_test.rb

@@ -20,7 +20,7 @@ class TestRedphonePagerduty < MiniTest::Unit::TestCase
     )
   end
 
-  def test_trigger_incident
+  def test_a_trigger_incident
     response = @pagerduty.trigger_incident(
       :service_key => PAGERDUTY_SERVICE_KEY,
       :description => "Testing Redphone Rubygem",
@@ -29,7 +29,7 @@ class TestRedphonePagerduty < MiniTest::Unit::TestCase
     assert_equal 'success', response['status']
   end
 
-  def test_resolve_incident
+  def test_b_resolve_incident
     response = @pagerduty.resolve_incident(
       :service_key => PAGERDUTY_SERVICE_KEY,
       :incident_key => "redphone/test"
@@ -37,7 +37,7 @@ class TestRedphonePagerduty < MiniTest::Unit::TestCase
     assert_equal 'success', response['status']
   end
 
-  def test_incidents
+  def test_c_incidents
     response = @pagerduty.incidents(:incident_key => "redphone/test")
     assert response['total'] > 0
   end

data/test/pingdom_test.rb

@@ -0,0 +1,59 @@
+$: << File.dirname(__FILE__) + '/../lib' unless $:.include?(File.dirname(__FILE__) + '/../lib/')
+require 'rubygems' if RUBY_VERSION < '1.9.0'
+gem 'minitest'
+require 'minitest/autorun'
+require 'redphone/pingdom'
+
+credentials = File.open("pingdom_credentials.txt", "rb").read.split("\n")
+PINGDOM_USER, PINGDOM_PASSWORD = credentials.each { |row| row }
+$test_check_id = nil
+
+class TestRedphonePingdom < MiniTest::Unit::TestCase
+  i_suck_and_my_tests_are_order_dependent!
+
+  def setup
+    @pingdom = Redphone::Pingdom.new(
+      :user => PINGDOM_USER,
+      :password => PINGDOM_PASSWORD
+    )
+  end
+
+  def test_a_create_check
+    response = @pingdom.create_check(
+      :name => "redphone",
+      :host => "www.amazon.ca",
+      :type => "http"
+    )
+    $test_check_id = response['check']['id']
+    assert_equal "redphone", response['check']['name']
+  end
+
+  def test_b_checks
+    response = @pingdom.checks
+    exists = false
+    assert_block(message="assert_block failed.") do
+      response['checks'].each do |check|
+        exists = true if check['name'] == "redphone"
+      end
+      exists
+    end
+  end
+
+  def test_c_actions
+    response = @pingdom.actions(:limit => 1)
+    assert response.has_key?("actions")
+  end
+
+  def test_d_results
+    response = @pingdom.results(
+      :id => $test_check_id,
+      :limit => 1
+    )
+    assert response.has_key?("results")
+  end
+
+  def test_e_delete_check
+    response = @pingdom.delete_check(:id => $test_check_id)
+    assert_equal "Deletion of check was successful!", response['message']
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redphone
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-08 00:00:00.000000000Z
+date: 2011-10-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70194551818180 !ruby/object:Gem::Requirement
+  requirement: &70239866142400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70194551818180
+  version_requirements: *70239866142400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70194551817500 !ruby/object:Gem::Requirement
+  requirement: &70239866141860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194551817500
+  version_requirements: *70239866141860
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70194551816900 !ruby/object:Gem::Requirement
+  requirement: &70239866141380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194551816900
+  version_requirements: *70239866141380
 description: A rubygem for talking to monitoring service APIs
 email:
 - portertech@gmail.com
@@ -59,11 +59,13 @@ files:
 - lib/redphone/helpers.rb
 - lib/redphone/loggly.rb
 - lib/redphone/pagerduty.rb
+- lib/redphone/pingdom.rb
 - lib/redphone/version.rb
 - redphone.gemspec
 - redphone.jpg
 - test/loggly_test.rb
 - test/pagerduty_test.rb
+- test/pingdom_test.rb
 homepage: https://github.com/portertech/redphone
 licenses: []
 post_install_message: 
@@ -91,3 +93,4 @@ summary: A rubygem for talking to monitoring service APIs
 test_files:
 - test/loggly_test.rb
 - test/pagerduty_test.rb
+- test/pingdom_test.rb