flapjack 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9aed6403dfdbf11787e5b39b0224f04c00294b8c
-  data.tar.gz: 2220ec7584002c684b8b6fdb26c843bb580486d4
+  metadata.gz: 0d000bd7c6fe6166ad1c537c91fe4c53ddc85d9b
+  data.tar.gz: 678ebf7c7d42fbe6041d28df1748c8e607674d0a
 SHA512:
-  metadata.gz: 729f88348650bbcbf3f8eb7787a177d22dad350e17fc89333e166c057b57425062fecbe336754b0acb755b61946520900ecb21c003795b40097adbd0eaffe2b6
-  data.tar.gz: f9925153a749408ebd31304306835d821e9367df09cda4c5067b5bb5ff70b3b29d7cd4e5b07b4d4fde9abb4d3e93adc2f5d5c2667686174df75f9d756164a982
+  metadata.gz: a0b577918c1f294d4c7619e5e97f025cd8b5d9bf7e1b144efdcedfc58f0d05e188a8394cd9b51b334e82cf5ff7a508ff20316a02c26e60b140426b3ef633d804
+  data.tar.gz: 5acab492158136c9a110435c53c07480b8ea390beaea33ae31336b397611e0f576f270940639f9737907dd90e7261f6484a9629681303f111f1e448bf2540f83

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Flapjack Changelog
 
+# 0.9.3 - 2014-07-28
+- Bug: fix outage reports in jsonapi c8e09f7 (@ali-graham)
+- Bug: fix maintenance reports in jsonapi 234ce48 (@ali-graham)
+- Bug: simplify checks reports in jsonapi 3eda22e (@ali-graham)
+
 # 0.9.2 - 2014-07-17
 - Feature: Add ability to disable check via JSON API #529 (@ali-graham)
 - Feature: Jabber - Resource in JID should be supported in the config #557 (@jessereynolds)

data/etc/flapjack_config.yaml.example

@@ -97,8 +97,8 @@ production:
         syslog_errors: yes
       # location of custom alert templates
       #templates:
-      #  rollup.text: '/etc/flapjack/templates/jabber/rollup.text.erb' 
-      #  alert.text: '/etc/flapjack/templates/jabber/alert.text.erb' 
+      #  rollup.text: '/etc/flapjack/templates/jabber/rollup.text.erb'
+      #  alert.text: '/etc/flapjack/templates/jabber/alert.text.erb'
     pagerduty:
       enabled: no
       queue: pagerduty_notifications
@@ -107,7 +107,7 @@ production:
         syslog_errors: yes
       # location of custom alert templates
       #templates:
-      #  alert.text: '/etc/flapjack/templates/pagerduty/alert.text.erb' 
+      #  alert.text: '/etc/flapjack/templates/pagerduty/alert.text.erb'
     web:
       enabled: yes
       port: 3080
@@ -245,8 +245,8 @@ development:
         syslog_errors: yes
       # location of custom alert templates
       #templates:
-      #  rollup.text: '/etc/flapjack/templates/jabber/rollup.text.erb' 
-      #  alert.text: '/etc/flapjack/templates/jabber/alert.text.erb' 
+      #  rollup.text: '/etc/flapjack/templates/jabber/rollup.text.erb'
+      #  alert.text: '/etc/flapjack/templates/jabber/alert.text.erb'
     pagerduty:
       enabled: no
       queue: pagerduty_notifications
@@ -255,12 +255,14 @@ development:
         syslog_errors: yes
       # location of custom alert templates
       #templates:
-      #  alert.text: '/etc/flapjack/templates/pagerduty/alert.text.erb' 
+      #  alert.text: '/etc/flapjack/templates/pagerduty/alert.text.erb'
     web:
       enabled: yes
       port: 4080
       timeout: 300
       access_log: "log/web_access.log"
+      api_url: "http://localhost:4082/"
+      base_url: "/"
       logger:
         level: INFO
         syslog_errors: yes
@@ -272,6 +274,15 @@ development:
       logger:
         level: INFO
         syslog_errors: yes
+    jsonapi:
+      enabled: yes
+      port: 4082
+      timeout: 300
+      access_log: "log/jsonapi_access.log"
+      base_url: "http://localhost:4082/"
+      logger:
+        level: INFO
+        syslog_errors: yes
     oobetet:
       enabled: no
       server: "jabber.example.com"

data/lib/flapjack/gateways/jsonapi/check_presenter.rb

@@ -81,7 +81,7 @@ module Flapjack
                       }
           end
 
-          result
+          {:outages => result}
         end
 
         def unscheduled_maintenance(start_time, end_time)
@@ -96,7 +96,7 @@ module Flapjack
               pu[:end_time] >= start_time
             }
 
-          start_in_unsched + unsched_maintenance
+          {:unscheduled_maintenances => (start_in_unsched + unsched_maintenance)}
         end
 
         def scheduled_maintenance(start_time, end_time)
@@ -111,7 +111,7 @@ module Flapjack
               ps[:end_time] >= start_time
             }
 
-          start_in_sched + sched_maintenance
+          {:scheduled_maintenances => (start_in_sched + sched_maintenance)}
         end
 
         # TODO test whether the below overlapping logic is prone to off-by-one
@@ -120,9 +120,7 @@ module Flapjack
         #
         # TODO test performance with larger data sets
         def downtime(start_time, end_time)
-          sched_maintenances = scheduled_maintenance(start_time, end_time)
-
-          outs = outage(start_time, end_time)
+          outs = outage(start_time, end_time)[:outages]
 
           total_secs  = {}
           percentages = {}
@@ -139,6 +137,8 @@ module Flapjack
             # We then create two new outage periods to cover the time around
             # the scheduled maintenance period, and remove the original.
 
+            sched_maintenances = scheduled_maintenance(start_time, end_time)[:scheduled_maintenances]
+
             sched_maintenances.each do |sm|
 
               split_outs = []

data/lib/flapjack/gateways/jsonapi/report_methods.rb

@@ -27,11 +27,9 @@ module Flapjack
             end
 
             checks = if event_ids.nil?
-              Flapjack::Data::Entity.all(:redis => redis).collect {|entity|
-                entity.check_list.collect {|check_name|
-                  find_entity_check(entity, check_name)
-                }
-              }.flatten(2)
+              Flapjack::Data::EntityCheck.find_all(:redis => redis).collect {|check_name|
+                find_entity_check_by_name(*check_name.split(':', 2))
+              }
             elsif !event_ids.empty?
               event_ids.collect {|event_id| find_entity_check_by_name(*event_id.split(':', 2)) }
             else

data/lib/flapjack/version.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end
 

data/spec/lib/flapjack/gateways/jsonapi/check_presenter_spec.rb

@@ -47,8 +47,10 @@ describe 'Flapjack::Gateways::JSONAPI::CheckPresenter' do
     ecp = Flapjack::Gateways::JSONAPI::CheckPresenter.new(entity_check)
     outages = ecp.outage(time - (5 * 60 * 60), time - (2 * 60 * 60))
     expect(outages).not_to be_nil
-    expect(outages).to be_an(Array)
-    expect(outages.size).to eq(4)
+    expect(outages).to be_a(Hash)
+    expect(outages).to have_key(:outages)
+    expect(outages[:outages]).to be_an(Array)
+    expect(outages[:outages].size).to eq(4)
 
     # TODO check the data in those hashes
   end
@@ -63,8 +65,10 @@ describe 'Flapjack::Gateways::JSONAPI::CheckPresenter' do
     ecp = Flapjack::Gateways::JSONAPI::CheckPresenter.new(entity_check)
     outages = ecp.outage(nil, nil)
     expect(outages).not_to be_nil
-    expect(outages).to be_an(Array)
-    expect(outages.size).to eq(4)
+    expect(outages).to be_a(Hash)
+    expect(outages).to have_key(:outages)
+    expect(outages[:outages]).to be_an(Array)
+    expect(outages[:outages].size).to eq(4)
 
     # TODO check the data in those hashes
   end
@@ -82,8 +86,10 @@ describe 'Flapjack::Gateways::JSONAPI::CheckPresenter' do
     ecp = Flapjack::Gateways::JSONAPI::CheckPresenter.new(entity_check)
     outages = ecp.outage(nil, nil)
     expect(outages).not_to be_nil
-    expect(outages).to be_an(Array)
-    expect(outages.size).to eq(3)
+    expect(outages).to be_a(Hash)
+    expect(outages).to have_key(:outages)
+    expect(outages[:outages]).to be_an(Array)
+    expect(outages[:outages].size).to eq(3)
   end
 
   it "returns a (small) outage hash for a single state change" do
@@ -95,8 +101,10 @@ describe 'Flapjack::Gateways::JSONAPI::CheckPresenter' do
     ecp = Flapjack::Gateways::JSONAPI::CheckPresenter.new(entity_check)
     outages = ecp.outage(nil, nil)
     expect(outages).not_to be_nil
-    expect(outages).to be_an(Array)
-    expect(outages.size).to eq(1)
+    expect(outages).to be_a(Hash)
+    expect(outages).to have_key(:outages)
+    expect(outages[:outages]).to be_an(Array)
+    expect(outages[:outages].size).to eq(1)
   end
 
   it "a list of unscheduled maintenances for an entity check" do
@@ -109,8 +117,10 @@ describe 'Flapjack::Gateways::JSONAPI::CheckPresenter' do
     ecp = Flapjack::Gateways::JSONAPI::CheckPresenter.new(entity_check)
     unsched_maint = ecp.unscheduled_maintenance(time - (12 * 60 * 60), time)
 
-    expect(unsched_maint).to be_an(Array)
-    expect(unsched_maint.size).to eq(4)
+    expect(unsched_maint).to be_a(Hash)
+    expect(unsched_maint).to have_key(:unscheduled_maintenances)
+    expect(unsched_maint[:unscheduled_maintenances]).to be_an(Array)
+    expect(unsched_maint[:unscheduled_maintenances].size).to eq(4)
 
     # TODO check the data in those hashes
   end
@@ -125,8 +135,10 @@ describe 'Flapjack::Gateways::JSONAPI::CheckPresenter' do
     ecp = Flapjack::Gateways::JSONAPI::CheckPresenter.new(entity_check)
     sched_maint = ecp.scheduled_maintenance(time - (12 * 60 * 60), time)
 
-    expect(sched_maint).to be_an(Array)
-    expect(sched_maint.size).to eq(4)
+    expect(sched_maint).to be_a(Hash)
+    expect(sched_maint).to have_key(:scheduled_maintenances)
+    expect(sched_maint[:scheduled_maintenances]).to be_an(Array)
+    expect(sched_maint[:scheduled_maintenances].size).to eq(4)
 
     # TODO check the data in those hashes
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante