interferon 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 135a20c25de376d383417a2422e23aa21b0beaef
-  data.tar.gz: e1f3761d1879482fd78adea7ed02bb4646f019d2
+  metadata.gz: b94afa9f628189dc66075b34239930dcfa60fa37
+  data.tar.gz: 2d566d59b5c4ac62784c359925df1e74f7711fb5
 SHA512:
-  metadata.gz: 73d944dfb3d1cb0e0082f406c54faf72bef2636b9e980278770d8e8cb95acf49106634e7a36388ae8b28d3812648860b42d40324b2b017641915fdb58d5eeb83
-  data.tar.gz: 5e7b9b47b9556bb0e102aad9cd5c7b4d8f678d5d7772e3fb534181d9eddd5afd92f0690b395efc7ac3fcb095fe240b7209dea874d8e1b5afb1ad386ebc50fded
+  metadata.gz: 5f458bfc7b930b91519e1b94098ba92eac52e2c0c4af9b63493d77e9230b8b787e2be63a89e0a0af7f5bc5b0edb07284dbbe1a037bf1a72914e0af32ab870730
+  data.tar.gz: 0c875b39a8df08c93588a8ea3c4726df280eb6d93a5f8e808ce58404859d6d71a22e130c5587f4412c183815be63069103d3e6a12cce85e02008f63e2f361a65

data/lib/interferon/alert.rb

@@ -14,6 +14,7 @@ module Interferon
     end
 
     def evaluate(hostinfo)
+      return self if @dsl && @dsl.applies == :once
       dsl = AlertDSL.new(hostinfo)
       dsl.instance_eval(@text, @filename, 1)
       @dsl = dsl

data/lib/interferon/alert_dsl.rb

@@ -122,6 +122,10 @@ module Interferon
     def audit(v = nil, &block)
       get_or_set(:@audit, v, block, false)
     end
+
+    def recovery(v = nil, &block)
+      get_or_set(:@recovery, v, block, true)
+    end
   end
 
   class MetricDSL

data/lib/interferon/destinations/datadog.rb

@@ -66,8 +66,15 @@ module Interferon::Destinations
       @api_errors ||= []
     end
 
-    def self.generate_message(message, people)
-      [message, ALERT_KEY, people.sort.map { |p| "@#{p}" }].flatten.join("\n")
+    def self.generate_message(message, people, options = {})
+      mentions = people.sort.map { |p| "@#{p}" }
+
+      unless options[:notify_recovery]
+        # Only mention on alert/warning
+        mentions = "{{^is_recovery}}#{mentions}{{/is_recovery}}"
+      end
+
+      [message, ALERT_KEY, mentions].flatten.join("\n")
     end
 
     def fetch_existing_alerts
@@ -132,7 +139,11 @@ module Interferon::Destinations
       # create a message which includes the notifications
       # Datadog may have a race condition where alerts created in a bad state may be triggered
       # during the dry-run creation process. Delete people from dry-run alerts to avoid this
-      message = self.class.generate_message(alert['message'], people)
+      message = self.class.generate_message(
+        alert['message'],
+        people,
+        notify_recovery: alert['notify']['recovery']
+      )
 
       # create the hash of options to send to datadog
       alert_options = {
@@ -338,7 +349,11 @@ EOM
       new_alert = {
         monitor_type: normalize_monitor_type(alert['monitor_type']),
         query: alert['metric']['datadog_query'],
-        message: generate_message(alert['message'], people).strip,
+        message: generate_message(
+          alert['message'],
+          people,
+          notify_recovery: alert['notify']['recovery']
+        ).strip,
         evaluation_delay: alert['evaluation_delay'],
         notify_no_data: alert['notify_no_data'],
         notify_audit: alert['notify']['audit'],

data/lib/interferon/version.rb

@@ -1,3 +1,3 @@
 module Interferon
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

data/lib/interferon.rb

@@ -148,7 +148,8 @@ module Interferon
     def update_alerts(destinations, hosts, alerts, groups)
       alerts_queue, alert_errors = build_alerts_queue(hosts, alerts, groups)
       if @dry_run && !alert_errors.empty?
-        raise "Alerts failed to apply or evaluate for all hosts: #{alerts.map(&:to_s).join(', ')}"
+        erroneous_alert_files = alerts_errors.map(&:to_s).join(', ')
+        raise "Alerts failed to apply or evaluate for all hosts: #{erroneous_alert_files}"
       end
 
       loader = DestinationsLoader.new([@alerts_repo_path])

data/spec/lib/interferon/destinations/datadog_spec.rb

@@ -114,4 +114,37 @@ describe Interferon::Destinations::Datadog do
       datadog.remove_alert(mock_alert)
     end
   end
+
+  describe '.generate_message' do
+    let(:message) { 'test message' }
+    let(:people) { %w(userA userB) }
+
+    it 'adds the ALERT_KEY to the message' do
+      expect(Interferon::Destinations::Datadog.generate_message(message, people)).to include(
+        Interferon::Destinations::Datadog::ALERT_KEY
+      )
+    end
+
+    it 'adds a mention to people' do
+      expect(Interferon::Destinations::Datadog.generate_message(message, people)).to include(
+        *people.map { |person| "@#{person}" }
+      )
+    end
+
+    it 'does not add ^is_recovery template variable when notify_recovery is true' do
+      expect(
+        Interferon::Destinations::Datadog.generate_message(
+          message, people, notify_recovery: true
+        )
+      ).not_to include('{{^is_recovery}}')
+    end
+
+    it 'adds a ^is_recovery template variable when notify_recovery is false' do
+      expect(
+        Interferon::Destinations::Datadog.generate_message(
+          message, people, notify_recovery: false
+        )
+      ).to include('{{^is_recovery}}')
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: interferon
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Igor Serebryany