redphone 0.0.3 → 0.0.4

data/README.org

@@ -1,27 +1,52 @@
 * Redphone, the monitoring service ruby library
   - Pagerduty support (integration, incidents)
+  - Loggly support (events)
   [[https://github.com/portertech/redphone/raw/master/redphone.jpg]]
 * Getting started
   : gem install redphone
 * Examples
 ** Pagerduty
   : require "redphone/pagerduty"
-  : pagerduty = Redphone::Pagerduty.new(:service_key => SERVICE_KEY)
-  Trigger an incident
-  : pagerduty.trigger_incident(:description => "Testing Redphone Rubygem.", :incident_key => "redphone/test")
-  Resolve an incident
-  : pagerduty.resolve_incident(:incident_key => "redphone/test")
-  List/query current and past incidents
-  : incidents = Redphone::Pagerduty.incidents(
+  : pagerduty = Redphone::Pagerduty.new(
+  :   :service_key => SERVICE_KEY,
   :   :subdomain => SUBDOMAIN,
   :   :user => USER,
-  :   :password => PASSWORD,
+  :   :password => PASSWORD
+  : )
+  Trigger an incident
+  : pagerduty.trigger_incident(
+  :   :description => "Testing Redphone Rubygem",
   :   :incident_key => "redphone/test"
   : )
+  : # OR Redphone::Pagerduty.trigger_incident()
+  Resolve an incident
+  : 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")
   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"
+** Loggly
+  : require "redphone/loggly"
+  : loggly = Redphone::Loggly.new(
+  :  :subdomain => SUBDOMAIN,
+  :  :user => USER,
+  :  :password => PASSWORD
+  : )
+  Create an event
+  : loggly.send_event(
+  :   :input_key => INPUT_KEY,
+  :   :input_type => "json",
+  :   :event => {
+  :     :service => "redphone",
+  :     :message => "test"
+  :   }
+  : )
+  : # OR Redphone::Loggly.send_event()
+  Search for previous event occurrences
+  : events = loggly.search(:q => "json.service:redphone")
 * Contributors
   - [[http://portertech.ca][Sean Porter]]

data/lib/redphone/helpers.rb

@@ -10,7 +10,8 @@ def http_request(options={})
   uri = URI.parse(options[:uri])
   user = options[:user]
   password = options[:password]
-  body = options[:body] || nil
+  headers = options[:headers] || Hash.new
+  body = options[:body]
   http = Net::HTTP.new(uri.host, uri.port)
   if options[:ssl] == true
     http.use_ssl = true
@@ -28,6 +29,9 @@ def http_request(options={})
   else
     raise "Unknown HTTP method: #{method}"
   end
+  headers.each do |header, value|
+    request.add_field(header, value)
+  end
   if user && password
     request.basic_auth user, password
   end

data/lib/redphone/loggly.rb

@@ -0,0 +1,48 @@
+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 =  options[:subdomain]
+      @user = options[:user]
+      @password = options[:password]
+      @input_key = options[:input_key]
+      @input_type = options[:input_type]
+    end
+
+    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}"
+      )
+      JSON.parse(response.body)
+    end
+
+    def self.send_event(options={})
+      raise "You must supply a input key" if options[:input_key].nil?
+      raise "You must supply an event hash" if options[:event].nil? || !options[:event].is_a?(Hash)
+      content_type = options[:input_type] == "json" ? "application/json" : "text/plain"
+      response = http_request(
+        :method => "post",
+        :ssl => true,
+        :uri => "https://logs.loggly.com/inputs/#{options[:input_key]}",
+        :headers => {"content-type" => content_type},
+        :body => options[:event].to_json
+      )
+      JSON.parse(response.body)
+    end
+
+    def send_event(options={})
+      options[:input_key] = options[:input_key] || @input_key
+      options[:input_type] = options[:input_type] || @input_type
+      self.class.send_event(options)
+    end
+  end
+end

data/lib/redphone/pagerduty.rb

@@ -3,44 +3,56 @@ require File.join(File.dirname(__FILE__), 'helpers')
 module Redphone
   class Pagerduty
     def initialize(options={})
-      raise "You must supply a service key" if options[:service_key].nil?
+      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 =  options[:subdomain]
+      @user = options[:user]
+      @password = options[:password]
       @service_key = options[:service_key]
     end
 
-    def integration_api(request_body)
+    def self.integration_api(request_body)
       response = http_request(
         :method => "post",
         :ssl => true,
         :uri => "https://events.pagerduty.com/generic/2010-04-15/create_event.json",
-        :body => request_body.merge({:service_key => @service_key}).to_json
+        :body => request_body.to_json
       )
       JSON.parse(response.body)
     end
 
-    def trigger_incident(options={})
+    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?
       request_body = options.merge!({:event_type => "trigger"})
       integration_api(request_body)
     end
 
-    def resolve_incident(options={})
+    def trigger_incident(options={})
+      options[:service_key] = options[:service_key] || @service_key
+      self.class.trigger_incident(options)
+    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?
       request_body = options.merge!({:event_type => "resolve"})
       integration_api(request_body)
     end
 
-    def self.incidents(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?
-      params_hash = options.reject { |key, value| [:subdomain, :user, :password].include?(key) }
-      params = params_hash.map { |key, value| "#{key}=#{CGI.escape(value)}"}.join("&")
+    def resolve_incident(options={})
+      options[:service_key] = options[:service_key] || @service_key
+      self.class.resolve_incident(options)
+    end
+
+    def incidents(options={})
+      params = options.map { |key, value| "#{key}=#{CGI.escape(value)}" }.join("&")
       response = http_request(
-        :method => "get",
-        :user => options[:user],
-        :password => options[:password],
+        :user => @user,
+        :password => @password,
         :ssl => true,
-        :uri => "https://#{options[:subdomain]}.pagerduty.com/api/v1/incidents?#{params}"
+        :uri => "https://#{@subdomain}.pagerduty.com/api/v1/incidents?#{params}"
       )
       JSON.parse(response.body)
     end

data/lib/redphone/version.rb

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

data/test/loggly_test.rb

@@ -0,0 +1,39 @@
+$: << 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/loggly'
+
+LOGGLY_INPUT_KEY = File.open("loggly_input_key.txt", "rb").read.gsub("\n", "")
+credentials = File.open("loggly_credentials.txt", "rb").read.split("\n")
+LOGGLY_SUBDOMAIN, LOGGLY_USER, LOGGLY_PASSWORD = credentials.each { |row| row }
+
+class TestRedphoneLoggly < MiniTest::Unit::TestCase
+  i_suck_and_my_tests_are_order_dependent!
+
+  def setup
+    @loggly = Redphone::Loggly.new(
+      #:input_key => LOGGLY_INPUT_KEY,
+      :subdomain => LOGGLY_SUBDOMAIN,
+      :user => LOGGLY_USER,
+      :password => LOGGLY_PASSWORD
+    )
+  end
+
+  def test_send_event
+    response = @loggly.send_event(
+      :input_key => LOGGLY_INPUT_KEY,
+      :input_type => "json",
+      :event => {
+        :service => "redphone",
+        :message => "test"
+      }
+    )
+    assert_equal 'ok', response['response']
+  end
+
+  def test_search
+    response = @loggly.search(:q => "json.service:redphone")
+    assert response['numFound'] > 0
+  end
+end

data/test/pagerduty_test.rb

@@ -4,34 +4,41 @@ gem 'minitest'
 require 'minitest/autorun'
 require 'redphone/pagerduty'
 
-SERVICE_KEY = File.open("pagerduty_service_key.txt", "rb").read.gsub("\n", "")
+PAGERDUTY_SERVICE_KEY = File.open("pagerduty_service_key.txt", "rb").read.gsub("\n", "")
 credentials = File.open("pagerduty_credentials.txt", "rb").read.split("\n")
-SUBDOMAIN, USER, PASSWORD = credentials.each { |row| row }
+PAGERDUTY_SUBDOMAIN, PAGERDUTY_USER, PAGERDUTY_PASSWORD = credentials.each { |row| row }
 
 class TestRedphonePagerduty < MiniTest::Unit::TestCase
   i_suck_and_my_tests_are_order_dependent!
 
   def setup
-    @pagerduty = Redphone::Pagerduty.new(:service_key => SERVICE_KEY)
+    @pagerduty = Redphone::Pagerduty.new(
+      #:service_key => PAGERDUTY_SERVICE_KEY,
+      :subdomain => PAGERDUTY_SUBDOMAIN,
+      :user => PAGERDUTY_USER,
+      :password => PAGERDUTY_PASSWORD
+    )
   end
 
   def test_trigger_incident
-    response = @pagerduty.trigger_incident(:description => "Testing Redphone Rubygem.", :incident_key => "redphone/test")
+    response = @pagerduty.trigger_incident(
+      :service_key => PAGERDUTY_SERVICE_KEY,
+      :description => "Testing Redphone Rubygem",
+      :incident_key => "redphone/test"
+    )
     assert_equal 'success', response['status']
   end
 
   def test_resolve_incident
-    response = @pagerduty.resolve_incident(:incident_key => "redphone/test")
+    response = @pagerduty.resolve_incident(
+      :service_key => PAGERDUTY_SERVICE_KEY,
+      :incident_key => "redphone/test"
+    )
     assert_equal 'success', response['status']
   end
 
   def test_incidents
-    response = Redphone::Pagerduty.incidents(
-      :subdomain => SUBDOMAIN,
-      :user => USER,
-      :password => PASSWORD,
-      :incident_key => "redphone/test"
-    )
+    response = @pagerduty.incidents(:incident_key => "redphone/test")
     assert response['total'] > 0
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redphone
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70118051461720 !ruby/object:Gem::Requirement
+  requirement: &70194551818180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70118051461720
+  version_requirements: *70194551818180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70118051461080 !ruby/object:Gem::Requirement
+  requirement: &70194551817500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70118051461080
+  version_requirements: *70194551817500
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70118051460460 !ruby/object:Gem::Requirement
+  requirement: &70194551816900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70118051460460
+  version_requirements: *70194551816900
 description: A rubygem for talking to monitoring service APIs
 email:
 - portertech@gmail.com
@@ -57,10 +57,12 @@ files:
 - Rakefile
 - lib/redphone.rb
 - lib/redphone/helpers.rb
+- lib/redphone/loggly.rb
 - lib/redphone/pagerduty.rb
 - lib/redphone/version.rb
 - redphone.gemspec
 - redphone.jpg
+- test/loggly_test.rb
 - test/pagerduty_test.rb
 homepage: https://github.com/portertech/redphone
 licenses: []
@@ -87,4 +89,5 @@ signing_key:
 specification_version: 3
 summary: A rubygem for talking to monitoring service APIs
 test_files:
+- test/loggly_test.rb
 - test/pagerduty_test.rb