flapjack 0.7.18 → 0.7.19

data/tmp/test_notification_rules_api.rb

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 
-require "httparty"
-require "json"
+require 'httparty'
+
+require 'oj'
+Oj.default_options = { :indent => 0, :mode => :strict }
 
 class Foo
 
@@ -153,7 +155,7 @@ class Foo
     do_post(url, data)
   end
 
-  rule = JSON.parse(get('/contacts/21/notification_rules').body).last
+  rule = Oj.load(get('/contacts/21/notification_rules').body).last
   rule_id = rule['id']
   raise RuntimeError unless rule_id
   puts "****** NOTIFICATION RULE ID TO PICK ON (PUT, DELETE) IS: #{rule_id} ******"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.7.18
+  version: 0.7.19
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -30,23 +30,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: log4r
-  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: yajl-ruby
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -205,22 +189,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: haml
-  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: thin
   requirement: !ruby/object:Gem::Requirement
@@ -437,7 +405,6 @@ files:
 - lib/flapjack/data/notification_rule.rb
 - lib/flapjack/data/tag.rb
 - lib/flapjack/data/tag_set.rb
-- lib/flapjack/executive.rb
 - lib/flapjack/filters/acknowledgement.rb
 - lib/flapjack/filters/base.rb
 - lib/flapjack/filters/delays.rb
@@ -452,7 +419,7 @@ files:
 - lib/flapjack/gateways/api/entity_presenter.rb
 - lib/flapjack/gateways/api/rack/json_params_parser.rb
 - lib/flapjack/gateways/email.rb
-- lib/flapjack/gateways/email/alert.html.haml
+- lib/flapjack/gateways/email/alert.html.erb
 - lib/flapjack/gateways/email/alert.text.erb
 - lib/flapjack/gateways/jabber.rb
 - lib/flapjack/gateways/oobetet.rb
@@ -466,21 +433,23 @@ files:
 - lib/flapjack/gateways/web/public/img/glyphicons-halflings-white.png
 - lib/flapjack/gateways/web/public/img/glyphicons-halflings.png
 - lib/flapjack/gateways/web/public/js/bootstrap.min.js
-- lib/flapjack/gateways/web/views/_css.haml
-- lib/flapjack/gateways/web/views/_foot.haml
-- lib/flapjack/gateways/web/views/_head.haml
-- lib/flapjack/gateways/web/views/_nav.haml
-- lib/flapjack/gateways/web/views/check.haml
-- lib/flapjack/gateways/web/views/checks.haml
-- lib/flapjack/gateways/web/views/contact.haml
-- lib/flapjack/gateways/web/views/contacts.haml
-- lib/flapjack/gateways/web/views/entities.haml
-- lib/flapjack/gateways/web/views/entity.haml
-- lib/flapjack/gateways/web/views/index.haml
-- lib/flapjack/gateways/web/views/self_stats.haml
+- lib/flapjack/gateways/web/views/_css.html.erb
+- lib/flapjack/gateways/web/views/_foot.html.erb
+- lib/flapjack/gateways/web/views/_head.html.erb
+- lib/flapjack/gateways/web/views/_nav.html.erb
+- lib/flapjack/gateways/web/views/check.html.erb
+- lib/flapjack/gateways/web/views/checks.html.erb
+- lib/flapjack/gateways/web/views/contact.html.erb
+- lib/flapjack/gateways/web/views/contacts.html.erb
+- lib/flapjack/gateways/web/views/entities.html.erb
+- lib/flapjack/gateways/web/views/entity.html.erb
+- lib/flapjack/gateways/web/views/index.html.erb
+- lib/flapjack/gateways/web/views/self_stats.html.erb
 - lib/flapjack/logger.rb
+- lib/flapjack/notifier.rb
 - lib/flapjack/patches.rb
 - lib/flapjack/pikelet.rb
+- lib/flapjack/processor.rb
 - lib/flapjack/rack_logger.rb
 - lib/flapjack/redis_pool.rb
 - lib/flapjack/utility.rb
@@ -495,7 +464,6 @@ files:
 - spec/lib/flapjack/data/notification_rule_spec.rb
 - spec/lib/flapjack/data/notification_spec.rb
 - spec/lib/flapjack/data/tag_spec.rb
-- spec/lib/flapjack/executive_spec.rb
 - spec/lib/flapjack/filters/acknowledgement_spec.rb
 - spec/lib/flapjack/filters/delays_spec.rb
 - spec/lib/flapjack/filters/detect_mass_client_failures_spec.rb
@@ -512,16 +480,18 @@ files:
 - spec/lib/flapjack/gateways/oobetet_spec.rb
 - spec/lib/flapjack/gateways/pagerduty_spec.rb
 - spec/lib/flapjack/gateways/sms_messagenet.spec.rb
-- spec/lib/flapjack/gateways/web/views/check.haml_spec.rb
-- spec/lib/flapjack/gateways/web/views/contact.haml_spec.rb
-- spec/lib/flapjack/gateways/web/views/index.haml_spec.rb
+- spec/lib/flapjack/gateways/web/views/check.html.erb_spec.rb
+- spec/lib/flapjack/gateways/web/views/contact.html.erb_spec.rb
+- spec/lib/flapjack/gateways/web/views/index.html.erb_spec.rb
 - spec/lib/flapjack/gateways/web_spec.rb
 - spec/lib/flapjack/logger_spec.rb
+- spec/lib/flapjack/notifier_spec.rb
 - spec/lib/flapjack/pikelet_spec.rb
+- spec/lib/flapjack/processor_spec.rb
 - spec/lib/flapjack/redis_pool_spec.rb
 - spec/lib/flapjack/utility_spec.rb
 - spec/spec_helper.rb
-- spec/support/haml_view_helper.rb
+- spec/support/erb_view_helper.rb
 - spec/support/profile_all_formatter.rb
 - spec/support/uncolored_doc_formatter.rb
 - tasks/events.rake
@@ -557,7 +527,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3760765416681204020
+      hash: -4516922423453420301
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -566,7 +536,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3760765416681204020
+      hash: -4516922423453420301
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -596,7 +566,6 @@ test_files:
 - spec/lib/flapjack/data/notification_rule_spec.rb
 - spec/lib/flapjack/data/notification_spec.rb
 - spec/lib/flapjack/data/tag_spec.rb
-- spec/lib/flapjack/executive_spec.rb
 - spec/lib/flapjack/filters/acknowledgement_spec.rb
 - spec/lib/flapjack/filters/delays_spec.rb
 - spec/lib/flapjack/filters/detect_mass_client_failures_spec.rb
@@ -613,15 +582,17 @@ test_files:
 - spec/lib/flapjack/gateways/oobetet_spec.rb
 - spec/lib/flapjack/gateways/pagerduty_spec.rb
 - spec/lib/flapjack/gateways/sms_messagenet.spec.rb
-- spec/lib/flapjack/gateways/web/views/check.haml_spec.rb
-- spec/lib/flapjack/gateways/web/views/contact.haml_spec.rb
-- spec/lib/flapjack/gateways/web/views/index.haml_spec.rb
+- spec/lib/flapjack/gateways/web/views/check.html.erb_spec.rb
+- spec/lib/flapjack/gateways/web/views/contact.html.erb_spec.rb
+- spec/lib/flapjack/gateways/web/views/index.html.erb_spec.rb
 - spec/lib/flapjack/gateways/web_spec.rb
 - spec/lib/flapjack/logger_spec.rb
+- spec/lib/flapjack/notifier_spec.rb
 - spec/lib/flapjack/pikelet_spec.rb
+- spec/lib/flapjack/processor_spec.rb
 - spec/lib/flapjack/redis_pool_spec.rb
 - spec/lib/flapjack/utility_spec.rb
 - spec/spec_helper.rb
-- spec/support/haml_view_helper.rb
+- spec/support/erb_view_helper.rb
 - spec/support/profile_all_formatter.rb
 - spec/support/uncolored_doc_formatter.rb

data/lib/flapjack/gateways/web/views/_foot.haml

@@ -1,8 +0,0 @@
-%div{:class => "container"}
-  %p{:class => "muted credit"}
-    = "Flapjack version #{::Flapjack::VERSION} | "
-    %a{:href => 'http://flapjack-project.com'}
-      Flapjack Project
-    = " | "
-    %a{:href => 'https://github.com/flpjck/flapjack'}
-      Flapjack on Github

data/lib/flapjack/gateways/web/views/_head.haml

@@ -1,10 +0,0 @@
-%meta{:name => 'viewport',
-      :content => 'width=device-width, initial-scale=1.0'}
-%link{:rel => 'stylesheet',
-      :href => '/css/bootstrap.min.css',
-      :media => 'screen'}
-%link{:rel => 'stylesheet',
-      :href => '/css/flapjack.css',
-      :media => 'screen'}
-%link{:rel => 'stylesheet',
-      :href => '/css/bootstrap-responsive.min.css'}

data/lib/flapjack/gateways/web/views/_nav.haml

@@ -1,14 +0,0 @@
-%p
-  %a(title='' href='/') Summary
-  |
-  %a(title='' href='/entities_all') All Entities
-  |
-  %a(title='' href='/entities_failing') Failing Entities
-  |
-  %a(title='' href='/checks_all') All Checks
-  |
-  %a(title='' href='/checks_failing') Failing Checks
-  |
-  %a(title='' href='/contacts') Contacts
-  |
-  %a(title='' href='/self_stats') Internal Statistics

data/lib/flapjack/gateways/web/views/check.haml

@@ -1,191 +0,0 @@
-!!! 5
-- nav = render_haml('_nav.haml', self)
-- head = render_haml('_head.haml', self)
-- foot = render_haml('_foot.haml', self)
-- check_path_escaped = URI.escape(@entity, ' #&;/=?') << '/' << URI.escape(@check, ' #&;/=?')
-- current_time = Time.now
-%html
-  %head
-    %title Flapjack - Check: #{@entity}:#{@check}
-    = head
-  %body
-    %div#wrap
-      %div{:class => "container"}
-        %div{:class => "page-header"}
-          = nav
-          %h2 #{@check} on #{@entity}
-        %h3 State: #{@check_state ? @check_state.upcase : ''}
-        - if (['warning', 'critical', 'unknown'].include?(@check_state) and !@current_scheduled_maintenance)
-          %form{:action => "/acknowledgements/#{check_path_escaped}", :method => "post", :class => "form-inline"}
-            %input{:type => 'hidden', :name => 'acknowledgement_id', :value => "#{@acknowledgement_id}"}
-            %input{:type => 'submit', :value => @current_unscheduled_maintenance ? 'Replace acknowledgment' : 'Acknowledge', :class => 'button'}
-            with
-            %label{:for => 'summary'}
-              summary:
-            %input{:type => 'text', :name => 'summary', :value => ''}
-            %label{:for => 'duration'}
-              duration:
-            %input{:type => 'text', :name => 'duration', :value => ''}
-              e.g. "5 hours"
-        - if @current_unscheduled_maintenance
-          %h3 (Acknowledged - #{@current_unscheduled_maintenance[:summary]})
-          - start  = Time.at(@current_unscheduled_maintenance[:start_time])
-          - finish = Time.at(@current_unscheduled_maintenance[:start_time] + @current_unscheduled_maintenance[:duration])
-          - remain = time_period_in_words( (finish - current_time).ceil )
-          %p #{start} -&gt; #{finish} (#{remain} remaining)
-          %form{:action => "/end_unscheduled_maintenance/#{check_path_escaped}", :method => "post"}
-            %p
-              %input{:type => 'submit', :value => 'End Unscheduled Maintenance (Unacknowledge)', :class => 'button'}
-        - if @current_scheduled_maintenance
-          %h4 (Scheduled Maintenance - #{@current_scheduled_maintenance[:summary]})
-          - start  = Time.at(@current_scheduled_maintenance[:start_time])
-          - finish = Time.at(@current_scheduled_maintenance[:start_time] + @current_scheduled_maintenance[:duration])
-          - remain = time_period_in_words( (finish - current_time).ceil )
-          %p #{start} -&gt; #{finish} (#{remain} remaining)
-        %h3 Output: #{@check_summary}
-        %p #{@check_details}
-        %table{:class => "table table-hover table-condensed"}
-          %tr
-            %td Last state change:
-            %td #{relative_time_ago(Time.at(@check_last_change.to_i))} ago
-            %td #{Time.at(@check_last_change.to_i)}
-            %td &nbsp;
-          %tr
-            %td Last update:
-            %td #{relative_time_ago(Time.at(@check_last_update.to_i))} ago
-            %td #{Time.at(@check_last_update.to_i)}
-            %td &nbsp;
-          - last_critical = nil
-          - if @last_notifications[:critical] && @last_notifications[:critical][:timestamp]
-            - t = Time.at(@last_notifications[:critical][:timestamp])
-            - last_critical = {:time => t.to_s, :relative => relative_time_ago(t) + " ago", :summary => @last_notifications[:critical][:summary]}
-          %tr
-            %td Last critical notification:
-            %td= last_critical ? last_critical[:relative] : 'never'
-            %td= last_critical ? last_critical[:time] : ''
-            %td= last_critical ? last_critical[:summary] : ''
-
-          - last_warning = nil
-          - if @last_notifications[:warning] && @last_notifications[:warning][:timestamp]
-            - t = Time.at(@last_notifications[:warning][:timestamp])
-            - last_warning = {:time => t.to_s, :relative => relative_time_ago(t) + " ago", :summary => @last_notifications[:warning][:summary]}
-          %tr
-            %td Last warning notification:
-            %td= last_warning ? last_warning[:relative] : 'never'
-            %td= last_warning ? last_warning[:time] : ''
-            %td= last_warning ? last_warning[:summary] : ''
-
-          - last_unknown = nil
-          - if @last_notifications[:unknown] && @last_notifications[:unknown][:timestamp]
-            - t = Time.at(@last_notifications[:unknown][:timestamp])
-            - last_unknown = {:time => t.to_s, :relative => relative_time_ago(t) + " ago", :summary => @last_notifications[:unknown][:summary]}
-          %tr
-            %td Last unknown notification:
-            %td= last_unknown ? last_unknown[:relative] : 'never'
-            %td= last_unknown ? last_unknown[:time] : ''
-            %td= last_unknown ? last_unknown[:summary] : ''
-
-          - last_recovery = nil
-          - if @last_notifications[:recovery] && @last_notifications[:recovery][:timestamp]
-            - t = Time.at(@last_notifications[:recovery][:timestamp])
-            - last_recovery = {:time => t.to_s, :relative => relative_time_ago(t) + " ago", :summary => @last_notifications[:recovery][:summary]}
-          %tr
-            %td Last recovery notification:
-            %td= last_recovery ? last_recovery[:relative] : 'never'
-            %td= last_recovery ? last_recovery[:time] : ''
-            %td= last_recovery ? last_recovery[:summary] : ''
-
-          - last_ack = nil
-          - if @last_notifications[:acknowledgement] && @last_notifications[:acknowledgement][:timestamp]
-            - t = Time.at(@last_notifications[:acknowledgement][:timestamp])
-            - last_ack = {:time => t.to_s, :relative => relative_time_ago(t) + " ago", :summary => @last_notifications[:acknowledgement][:summary]}
-          %tr
-            %td Last acknowledgement notification:
-            %td= last_ack ? last_ack[:relative] : 'never'
-            %td= last_ack ? last_ack[:time] : ''
-            %td= last_ack ? last_ack[:summary] : ''
-
-        %h3 Scheduled Maintenance Periods
-        - if @scheduled_maintenances && !@scheduled_maintenances.empty?
-          %table{:class => "table table-bordered table-hover table-condensed"}
-            %tr
-              %th Start
-              %th End
-              %th Duration
-              %th Summary
-              %th Actions
-            - @scheduled_maintenances.sort_by {|s| s[:start_time]}.each do |scheduled_maintenance|
-              - start_time = scheduled_maintenance[:start_time]
-              - end_time   = scheduled_maintenance[:end_time]
-              - duration   = scheduled_maintenance[:duration]
-              - summary    = scheduled_maintenance[:summary]
-              %tr
-                %td= Time.at(start_time).to_s
-                %td= Time.at(end_time).to_s
-                %td= ChronicDuration.output(duration)
-                %td= summary
-                %td
-                  - if end_time > current_time.to_i
-                    - label = (start_time > current_time.to_i) ? 'Delete' : 'End Now'
-                    %form{ :action => "/scheduled_maintenances/#{check_path_escaped}", :method => "post"}
-                      %input{:type => 'hidden', :name => '_method', :value => 'delete'}
-                      %input{:type => 'hidden', :name => 'start_time', :value => start_time}
-                      %input{:type => 'submit', :value => label, :class => 'button'}
-        - else
-          %p No maintenance is scheduled
-        %h4 Add Scheduled Maintenance
-        %form{:action => "/scheduled_maintenances/#{check_path_escaped}", :method => "post", :class => "form-horizontal"}
-          %div{:class => "control-group"}
-            %label{:class => "control-label", :for => 'start_time'} Start time:
-            %div{:class => "controls"}
-              %input{:type => 'text', :name => 'start_time', :class => 'text', :size => '20', :maxlength => '80'}
-              e.g. "today 4pm", "two hours hence", "friday 2pm", "2012-01-28 13:00"
-          %div{:class => "control-group"}
-            %label{:class => "control-label", :for => 'duration'} Duration:
-            %div{:class => "controls"}
-              %input{:type => 'text', :name => 'duration', :class => 'text', :size => '20', :maxlength => '80'}
-              e.g. "1 hour", "2:30:00", "three days", etc
-          %div{:class => "control-group"}
-            %label{:class => "control-label", :for => 'summary'} Summary:
-            %div{:class => "controls"}
-              %input{:type => 'text', :name => 'summary', :class => 'text', :size => '80', :maxlength => '160'}
-          %div{:class => "control-group"}
-            %div{:class => "controls"}
-              %input{:type => 'submit', :value => 'Save', :class => 'button'}
-        %p Times given will be interpreted in the local timezone of  #{local_timezone}
-
-        - if @state_changes && !@state_changes.empty?
-          %h3 Recent state changes
-          %table{:class => "table table-bordered table-hover table-condensed"}
-            %tr
-              %th Timestamp
-              %th State
-              %th Summary
-            - @state_changes.each do |sc|
-              %tr
-                %td= Time.at(sc[:timestamp]).to_s
-                %td= sc[:state]
-                %td= sc[:summary]
-
-        %h3 Contacts
-        - if @contacts && !@contacts.empty?
-          %table{:class => "table table-bordered table-hover table-condensed"}
-            %tr
-              %th Name
-              %th Media
-            - @contacts.sort_by {|c| [c.first_name, c.last_name] }.each do |contact|
-              %tr
-                %td
-                  - link = "/contacts/#{contact.id}"
-                  %a(title='contact details' href=link) #{contact.name}
-                %td
-                  - if contact.media && !contact.media.empty?
-                    %p= contact.media.keys.collect(&:capitalize).join(", ")
-                  - else
-                    %p No media
-        - else
-          %p No contacts
-      %div#push
-    %div#footer
-      = foot
-

data/lib/flapjack/gateways/web/views/checks.haml

@@ -1,49 +0,0 @@
-!!! 5
-- nav = render_haml('_nav.haml', self)
-- head = render_haml('_head.haml', self)
-- foot = render_haml('_foot.haml', self)
-%html
-  %head
-    %title Flapjack - #{@adjective.capitalize} Checks
-    = head
-  %body
-    %div#wrap
-      %div{:class => "container"}
-        %div{:class => "page-header"}
-          = nav
-          %h2 #{@adjective.capitalize} Checks
-        %p #{@count_failing_checks} failing out of #{@count_all_checks}
-        %table{:class => "table table-bordered table-hover table-condensed"}
-          %tr
-            %th Entity
-            %th Check
-            %th State
-            %th Last State Change
-            %th Last Update
-            %th Last Notification
-          - @states.each do |entity, check, status, changed, updated, in_unscheduled_outage, in_scheduled_outage, notified_kind, notified|
-            - colour_class = status
-            - case status
-            - when 'critical', 'unknown'
-              - colour_class = 'error'
-            - when 'ok', 'up'
-              - colour_class = 'success'
-            %tr{:class => colour_class}
-              %td= entity
-              %td
-                - link = "/check?entity=" + CGI.escape(entity) + "&check=" + CGI.escape(check)
-                %a(title='check detail' href=link) #{check}
-              %td{:class => status}
-                = status.upcase
-                = " (Acknowledged)" if in_unscheduled_outage
-                = " (Scheduled Maintenance)" if in_scheduled_outage
-              %td= relative_time_ago(Time.at(changed.to_i)) + ' ago'
-              %td= relative_time_ago(Time.at(updated.to_i)) + ' ago'
-              - if notified && (notified > 0)
-                - last_notified = relative_time_ago(Time.at(notified.to_i)) + " ago, #{notified_kind}"
-              - else
-                - last_notified = 'never'
-              %td= last_notified
-      %div#push
-    %div#footer
-      = foot