flapjack 0.7.13 → 0.7.14

data/.travis.yml

@@ -9,4 +9,5 @@ before_script:
   - mkdir -p ./log
 before_install:
   - git submodule update --init --recursive
+  - gem install bundler
 script: bundle exec rspec spec && bundle exec cucumber features

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Flapjack Changelog
 
+# 0.7.14 - 2013-06-19
+- Bug: Display of checks on web ui with a colon in their name is screwed gh-213 (@jessereynolds)
+- Bug: show last critical, warning, unknown notificaiton times in web ui gh-211 (@jessereynolds)
+
 # 0.7.13 - 2013-06-18
 - Bug: test notifications are blocked by notification rules gh-188 (@jessereynolds)
 - Bug: unscheduled maintenances does not prevent alerts for checks with colons in their name gh-208 (@jessereynolds)

data/lib/flapjack/data/entity.rb

@@ -97,12 +97,12 @@ module Flapjack
 
       def self.find_all_with_checks(options)
         raise "Redis connection not set" unless redis = options[:redis]
-        redis.keys("check:*").map {|s| s.match(/.*:(.*):.*/)[1] }.to_set
+        redis.keys("check:*").map {|s| s.sub(/^check:/, '').split(':', 2).first }.to_set
       end
 
       def self.find_all_with_failing_checks(options)
         raise "Redis connection not set" unless redis = options[:redis]
-        redis.zrange("failed_checks", 0, -1).map {|s| s.match(/(.*):.*/)[1] }.to_set
+        redis.zrange("failed_checks", 0, -1).map {|s| s.split(':', 2).first }.to_set
       end
 
       def contacts

data/lib/flapjack/gateways/web.rb

@@ -82,8 +82,8 @@ module Flapjack
 
         # TODO (?) recast as Entity.all do |e|; e.checks.do |ec|; ...
         @states = redis.keys('*:*:states').map { |r|
-          parts  = r.split(':')[0..1]
-          [parts[0], parts[1]] + entity_check_state(parts[0], parts[1])
+          entity, check = r.sub(/:states$/, '').split(':', 2)
+          [entity, check] + entity_check_state(entity, check)
         }.compact.sort_by {|parts| parts }
 
         haml :checks
@@ -94,7 +94,7 @@ module Flapjack
         @adjective = 'failing'
 
         @states = redis.zrange('failed_checks', 0, -1).map {|key|
-          parts  = key.split(':')
+          parts  = key.split(':', 2)
           [parts[0], parts[1]] + entity_check_state(parts[0], parts[1])
         }.compact.sort_by {|parts| parts}
 
@@ -159,8 +159,8 @@ module Flapjack
         @entity = params[:entity]
         entity_stats
         @states = redis.keys("#{@entity}:*:states").map { |r|
-          parts  = r.split(':')[0..1]
-          [parts[0], parts[1]] + entity_check_state(parts[0], parts[1])
+          check = r.sub(/^#{@entity}:/, '').sub(/:states$/, '')
+          [@entity, check] + entity_check_state(@entity, check)
         }.compact.sort_by {|parts| parts }
         haml :entity
       end

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

@@ -44,16 +44,36 @@
             %td Last update:
             %td #{relative_time_ago(Time.at(@check_last_update.to_i))} ago
             %td #{Time.at(@check_last_update.to_i)}
-          - if @last_notifications[:problem]
-            - last_problem_relative = relative_time_ago(Time.at(@last_notifications[:problem])) + " ago"
-            - last_problem          = Time.at(@last_notifications[:problem]).to_s
+          - if @last_notifications[:critical]
+            - last_critical_relative = relative_time_ago(Time.at(@last_notifications[:critical])) + " ago"
+            - last_critical          = Time.at(@last_notifications[:critical]).to_s
           - else
-            - last_problem_relative = 'never'
-            - last_problem          = ''
+            - last_critical_relative = 'never'
+            - last_critical          = ''
           %tr
-            %td Last problem notification:
-            %td= last_problem_relative
-            %td= last_problem
+            %td Last critical notification:
+            %td= last_critical_relative
+            %td= last_critical
+          - if @last_notifications[:warning]
+            - last_warning_relative = relative_time_ago(Time.at(@last_notifications[:warning])) + " ago"
+            - last_warning          = Time.at(@last_notifications[:warning]).to_s
+          - else
+            - last_warning_relative = 'never'
+            - last_warning          = ''
+          %tr
+            %td Last warning notification:
+            %td= last_warning_relative
+            %td= last_warning
+          - if @last_notifications[:unknown]
+            - last_unknown_relative = relative_time_ago(Time.at(@last_notifications[:unknown])) + " ago"
+            - last_unknown          = Time.at(@last_notifications[:unknown]).to_s
+          - else
+            - last_unknown_relative = 'never'
+            - last_unknown          = ''
+          %tr
+            %td Last unknown notification:
+            %td= last_unknown_relative
+            %td= last_unknown
           - if @last_notifications[:recovery]
             - last_recovery_relative = relative_time_ago(Time.at(@last_notifications[:recovery])) + " ago"
             - last_recovery          = Time.at(@last_notifications[:recovery]).to_s

data/lib/flapjack/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.7.13"
+  VERSION = "0.7.14"
 end

data/spec/lib/flapjack/gateways/web_spec.rb

@@ -67,7 +67,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
   # (for the methods that access redis directly)
 
   it "shows a page listing all checks" do
-    redis.should_receive(:keys).with('*:*:states').and_return(["#{entity_name}:#{check}:states"])
+    redis.should_receive(:keys).with('*:*:states').and_return(["#{entity_name}:#{check}"])
 
     expect_check_stats
 
@@ -84,7 +84,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
   end
 
   it "shows a page listing failing checks" do
-    redis.should_receive(:zrange).with('failed_checks', 0, -1).and_return(["#{entity_name}:#{check}:states"])
+    redis.should_receive(:zrange).with('failed_checks', 0, -1).and_return(["#{entity_name}:#{check}"])
 
     expect_check_stats
 
@@ -101,7 +101,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
 
   it "shows a page listing flapjack statistics" do
     redis.should_receive(:keys).with('check:*').and_return([])
-    redis.should_receive(:zrange).with('failed_checks', 0, -1).and_return(["#{entity_name}:#{check}:states"])
+    redis.should_receive(:zrange).with('failed_checks', 0, -1).and_return(["#{entity_name}:#{check}"])
     expect_stats
     expect_check_stats
     expect_entity_stats

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.7.13
+  version: 0.7.14
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -554,7 +554,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1459875303565561678
+      hash: 1257649684215176614
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -563,7 +563,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1459875303565561678
+      hash: 1257649684215176614
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23