pagerduty.rb in flapjack-0.8.6

- old
+ new

@@ -5,11 +5,10 @@
 require 'em-synchrony/em-http'
 
 require 'oj'
 
 require 'flapjack/data/entity_check'
-require 'flapjack/data/global'
 require 'flapjack/data/alert'
 require 'flapjack/redis_pool'
 require 'flapjack/utility'
 
 module Flapjack
@@ -79,11 +78,16 @@
             alert = Flapjack::Data::Alert.new(event, :logger => @logger)
             @logger.debug("processing pagerduty notification service_key: #{alert.address}, entity: #{alert.entity}, " +
                           "check: '#{alert.check}', state: #{alert.state}, summary: #{alert.summary}")
 
             mydir = File.dirname(__FILE__)
-            message_template_path = mydir + "/pagerduty/alert.text.erb"
+            message_template_path = case
+            when @config.has_key?('templates') && @config['templates']['alert.text']
+              @config['templates']['alert.text']
+            else
+              mydir + "/pagerduty/alert.text.erb"
+            end
             message_template = ERB.new(File.read(message_template_path), nil, '-')
 
             @alert = alert
             bnd    = binding
 
@@ -172,10 +176,10 @@
       end
 
       def find_pagerduty_acknowledgements
         @logger.debug("looking for acks in pagerduty for unack'd problems")
 
-        unacknowledged_failing_checks = Flapjack::Data::Global.unacknowledged_failing_checks(:redis => @redis)
+        unacknowledged_failing_checks = Flapjack::Data::EntityCheck.unacknowledged_failing(:redis => @redis)
 
         @logger.debug "found unacknowledged failing checks as follows: " + unacknowledged_failing_checks.join(', ')
 
         unacknowledged_failing_checks.each do |entity_check|
 