flapjack 0.6.38 → 0.6.39

data/spec/spec_helper.rb

@@ -12,6 +12,9 @@ FLAPJACK_ENV = ENV["FLAPJACK_ENV"] || 'test'
 require 'bundler'
 Bundler.require(:default, :test)
 
+require 'webmock/rspec'
+WebMock.disable_net_connect!
+
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 # Requires supporting files with custom matchers and macros, etc,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.6.38
+  version: 0.6.39
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -285,22 +285,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -317,22 +301,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Flapjack is distributed monitoring notification system that provides
   a scalable method for processing streams of events from Nagios and deciding who
   should be notified
@@ -350,6 +318,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .gitmodules
 - .rbenv-version
 - .rspec
 - .travis.yml
@@ -382,12 +351,6 @@ files:
 - dist/puppet/ruby/manifests/dev.pp
 - dist/puppet/ruby/manifests/rubygems.pp
 - dist/puppet/sqlite3/manifests/dev.pp
-- doc/CONFIGURING.md
-- doc/DEBUGGING.md
-- doc/DEVELOPING.md
-- doc/GLOSSARY.md
-- doc/INSTALL.md
-- doc/PACKAGING.md
 - etc/flapjack_config.yaml.example
 - features/events.feature
 - features/notifications.feature
@@ -416,6 +379,7 @@ files:
 - lib/flapjack/data/entity.rb
 - lib/flapjack/data/entity_check.rb
 - lib/flapjack/data/event.rb
+- lib/flapjack/data/global.rb
 - lib/flapjack/executive.rb
 - lib/flapjack/filters/acknowledgement.rb
 - lib/flapjack/filters/base.rb
@@ -513,7 +477,10 @@ files:
 - spec/lib/flapjack/jabber_spec.rb
 - spec/lib/flapjack/notification/email_spec.rb
 - spec/lib/flapjack/notification/sms_spec.rb
+- spec/lib/flapjack/oobetet_spec.rb
+- spec/lib/flapjack/pagerduty_spec.rb
 - spec/lib/flapjack/pikelet_spec.rb
+- spec/lib/flapjack/redis_pool_spec.rb
 - spec/lib/flapjack/web_spec.rb
 - spec/spec_helper.rb
 - spec/support/profile_all_formatter.rb
@@ -586,7 +553,10 @@ test_files:
 - spec/lib/flapjack/jabber_spec.rb
 - spec/lib/flapjack/notification/email_spec.rb
 - spec/lib/flapjack/notification/sms_spec.rb
+- spec/lib/flapjack/oobetet_spec.rb
+- spec/lib/flapjack/pagerduty_spec.rb
 - spec/lib/flapjack/pikelet_spec.rb
+- spec/lib/flapjack/redis_pool_spec.rb
 - spec/lib/flapjack/web_spec.rb
 - spec/spec_helper.rb
 - spec/support/profile_all_formatter.rb

data/doc/CONFIGURING.md

@@ -1,38 +0,0 @@
-### Configuring ###
-
-You can configure who receives notifications from `flapjack-notifier` 
-in `/etc/flapjack/recipients.yaml`:
-
-    ---
-    - :name: Jane Doe
-      :email: "jane@doe.com"
-      :phone: "+61 444 222 111"
-      :pager: "61444222111"
-      :jid: "jane@doe.com"
-
-Then you can configure how people are notified in `/etc/flapjack/flapjack-notifier.yaml`: 
-
-    --- 
-    :notifiers: 
-      :mailer: 
-        :from_address: notifications@my-domain.com
-      :xmpp: 
-        :jid: notifications@my-domain.com
-        :password: foo
-    :database_uri: "sqlite3:///var/lib/flapjack/flapjack.db"
-
-Currently there are email and XMPP notifiers. 
-
-The `database_uri` setting must point to the database `flapjack-admin` backs 
-onto. This can be SQLite3, MySQL, or PostgreSQL:
-
-    :database_uri: "mysql://user:password@localhost/flapjack_production"
-    # or
-    :database_uri: "postgres://me:spoons@db.mydomain.com/flapjack_production"
-    
-Now you need to restart the notifier: 
-
-    flapjack-notifier-manager restart --recipients /etc/flapjack/recipients.yaml \
-                                      --config /etc/flapjack/flapjack-notifier.yaml
-
-

data/doc/DEBUGGING.md

@@ -1,28 +0,0 @@
-Here's some useful ways of debugging various things in Flapjack.
-
-Redis Connection Leaks
-
-The following command reports every five seconds the number of connections to redis (as reported by lsof) and the totall number of EM external protocol connections currently in place:
-
-production paths:
-
-    while true ; do
-      echo -n "EM connection count: "
-      tail -50000 /var/log/flapjack/flapjack.log | grep -i "connection count" \
-      | tail -1 | awk '{ print $5 }'
-      echo -n "lsof redis: "
-      sudo lsof -p `cat /var/run/flapjack/flapjack.pid` | grep :6379 | wc -l
-      sleep 5
-    done
-
-development paths:
-
-    while true ; do
-      echo -n "EM connection count: "
-      tail -50000 log/flapjack.log | grep -i "connection count" \
-      | tail -1 | awk '{ print $5 }'
-      echo -n "lsof redis: "
-      sudo lsof -p `cat tmp/pids/flapjack.pid` | grep localhost:6379 | wc -l
-      sleep 5
-    done
-

data/doc/DEVELOPING.md

@@ -1,35 +0,0 @@
-Developing
-----------
-
-You can write your own notifiers and place them in `lib/flapjack/notifiers/`.
-
-Your notifier just needs to implement the `notify` method, and take in a hash:
-
-    class Sms
-      def initialize(opts={})
-        # you may want to set from address here
-        @from = (opts[:from] || "0431 112 233")
-      end
-
-      def notify(opts={})
-        who = opts[:who]
-        result = opts[:result]
-        # sms to your hearts content
-      end
-    end
-
-
-Testing
--------
-
-Flapjack is, and will continue to be, well tested. Monitoring is like continuous
-integration for production apps, so why shouldn't your monitoring system have tests?
-
-Testing is done with rspec, and tests live in `spec/`.
-
-To run the tests, check out the code and run:
-
-    $ rake spec
-
-
-

data/doc/GLOSSARY.md

@@ -1,19 +0,0 @@
-
-As implemented for the reporting API functions, these are placeholder terms only and open for discussion.
-
-<dl>
-<dt>Entity</dt>
-<dd>TODO</dd>
-<dt>Check</dt>
-<dd>TODO</dd>
-
-<dt>Outage</dt>
-<dd>Period of time from when a check goes into the 'CRITICAL'
-state to when it comes out of that state again</dd>
-<dt>Scheduled maintenance</dt>
-<dd>Periods of time explicitly created by external actors to denote that maintenance is scheduled to occur at these times.</dd>
-<dt>Unscheduled maintenance</dt>
-<dd>Periods of time explicitly created by external actors to denote that maintenance is happening or has happened at these times</dd>
-<dt>Downtime</dt>
-<dd>Outages minus scheduled maintenances across any given time period</dd>
-</dl>

data/doc/INSTALL.md

@@ -1,64 +0,0 @@
-Dependencies
-------------
-
-Before installing Flapjack you will need to setup some dependencies.
-
-### Setup dependencies (Ubuntu Hardy) ###
-
-Add the following lines to `/etc/apt/sources.list`
-
-    deb http://ppa.launchpad.net/ubuntu-ruby-backports/ubuntu hardy main
-    deb http://ppa.launchpad.net/auxesis/ppa/ubuntu hardy main
-
-Add GPG keys for the repos: 
-
-    sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 288BA53BCB7DA731
-
-Update your package list:
-
-    sudo apt-get update 
-
-Install Ruby dependencies: 
-
-    sudo apt-get install build-essential libsqlite3-dev
-
-Install rubygems + beanstalkd:
-
-    sudo apt-get install rubygems beanstalkd
-
-Set `ENABLED=1` in `/etc/default/beanstalkd`.
-
-Start beanstalkd: 
-
-    sudo /etc/init.d/beanstalkd start
-
-
-### Setup dependencies (everyone else) ###
-
-Install the following software through your package manager or from source: 
-
- - beanstalkd (from [http://xph.us/software/beanstalkd/](http://xph.us/software/beanstalkd/))
- - libevent (from [http://monkey.org/~provos/libevent/](http://monkey.org/~provos/libevent/))
- - latest RubyGems (from [http://rubyforge.org/projects/rubygems/](http://rubyforge.org/projects/rubygems/))
-
-
-## Installation ##
-
-Add GitHub's RubyGems server to your Gem sources: 
-
-    sudo gem sources -a http://gems.github.com
-
-Install the Flapjack gem: 
-
-    sudo gem install auxesis-flapjack
-
-Then run the magic configuration script to set up init scripts: 
-
-    sudo install-flapjack-systemwide
-
-The script will prompt you if it wants to do anything destructive. 
-
-## Packages ##
-
-We want to provide native packages for Flapjack (`.deb`, `.rpm`, `.ebuild`). If 
-you'd like to contribute please let us know! 

data/doc/PACKAGING.md

@@ -1,25 +0,0 @@
-Debian / Ubuntu
-===============
-
-Packaged dependencies: 
-
- * libdaemons-ruby 
- * liblog4r-ruby
- * libxmpp4r-ruby
- * libtmail-ruby 
-
-Unpackaged dependencies: 
-
- * beanstalkd-client (libbeanstalkd-ruby)
- * dm-core 
- * dm-timestamps
- * dm-types
- * dm-validations
- * data_objects
- * do_sqlite3
- * do_mysql
-
-The unpackaged dependencies need to be packaged to make Flapjack packagable. 
-
-Current development efforts are working towards abstracting the 
-DataMapper/DataObjects dependency so packaging isn't a complete travesty.