interferon 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9fbb5fdb83e9978e96990983e1c815fd18e7cdc
-  data.tar.gz: 0d5b080a2ad8dbdd8a16edd1bcae27aadfb6c366
+  metadata.gz: 1c7f74fc8e23da780fdf783cdb98387321d20513
+  data.tar.gz: 5aa81e287ab880c2d3e7af7bd96a035d41b3db21
 SHA512:
-  metadata.gz: 542ec78306622d95e55f698f2c0b35b7f0a8365a8eb0f2f85d0faff851fd22f5ddaef5d5b5c2f8adf585f0a297d23f0684cf5293122073729bd326cd23dab530
-  data.tar.gz: 271d43056cc9be797fb8e4ae3f98d4370518481f71bcf4b1f0d749b09e1433e36666b9ca701439d4bc6167a9857a2c53977836131d7f5a55355e44fa6d140c9d
+  metadata.gz: 82c25b9118d41092d6ab131dd7edba612f40e68d4959bd0849efb4d0d2483bd5056b806dfc1c6f7e21381badd83cfb1e4f4e62fba8497bb3e6c52c4f33479dd2
+  data.tar.gz: 24740188b929de430442f21501ef75de6a7fd148835c3491da1827c77f62b169c2ccca38507ee400f4c938d87ac273935ce63bb9c966c6da4851e6c49d0cc6c9

data/lib/interferon/alert_dsl.rb

@@ -120,7 +120,7 @@ module Interferon
     end
 
     def audit(v = nil, &block)
-      get_or_set(:@audit, v, block, true)
+      get_or_set(:@audit, v, block, false)
     end
   end
 

data/lib/interferon/destinations/datadog.rb

@@ -66,8 +66,8 @@ module Interferon::Destinations
       @api_errors ||= []
     end
 
-    def generate_message(message, people)
-      [message, ALERT_KEY, people.map { |p| "@#{p}" }].flatten.join("\n")
+    def self.generate_message(message, people)
+      [message, ALERT_KEY, people.sort.map { |p| "@#{p}" }].flatten.join("\n")
     end
 
     def fetch_existing_alerts
@@ -132,7 +132,7 @@ 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 = generate_message(alert['message'], people)
+      message = self.class.generate_message(alert['message'], people)
 
       # create the hash of options to send to datadog
       alert_options = {
@@ -201,7 +201,7 @@ EOM
         alert['monitor_type'],
         datadog_query,
         name: alert['name'],
-        message: @dry_run ? generate_message(alert, []) : message,
+        message: @dry_run ? self.class.generate_message(alert, []) : message,
         options: alert_options
       )
     end
@@ -234,10 +234,10 @@ EOM
           alert['monitor_type'],
           datadog_query,
           name: alert['name'],
-          message: generate_message(alert, []),
+          message: self.class.generate_message(alert, []),
           options: alert_options
         )
-      elsif alert['monitor_type'] == existing_alert['type']
+      elsif self.class.same_monitor_type(alert['monitor_type'], existing_alert['type'])
         resp = @dog.update_monitor(
           id,
           datadog_query,
@@ -290,6 +290,67 @@ EOM
       end
     end
 
+    def remove_alert_by_id(alert_id)
+      # This should only be used by dry-run to clean up created dry-run alerts
+      log.debug("deleting alert, id: #{alert_id}")
+      resp = @dog.delete_monitor(alert_id)
+      code = resp[0].to_i
+      log_datadog_response_code(resp, code, :deleting)
+    end
+
+    def need_update(alert_people_pair, existing_alerts_from_api)
+      alert, people = alert_people_pair
+      existing = existing_alerts_from_api[alert['name']]
+      existing.nil? || !self.class.same_alerts(alert, people, existing)
+    end
+
+    def self.normalize_monitor_type(monitor_type)
+      # Convert 'query alert' type to 'metric alert' type. They can used interchangeably when
+      # submitting monitors to Datadog. Datadog will automatically do the conversion to 'query
+      # alert' for a "complex" query that includes multiple metrics/tags while using 'metric alert'
+      # for monitors that include a single scope/metric.
+      monitor_type == 'query alert' ? 'metric alert' : monitor_type
+    end
+
+    def self.same_monitor_type(monitor_type_a, monitor_type_b)
+      normalize_monitor_type(monitor_type_a) == normalize_monitor_type(monitor_type_b)
+    end
+
+    def self.same_alerts(alert, people, alert_api_json)
+      prev_alert = {
+        monitor_type: normalize_monitor_type(alert_api_json['type']),
+        query: alert_api_json['query'].strip,
+        message: alert_api_json['message'].strip,
+        evaluation_delay: alert_api_json['options']['evaluation_delay'],
+        notify_no_data: alert_api_json['options']['notify_no_data'],
+        notify_audit: alert_api_json['options']['notify_audit'],
+        no_data_timeframe: alert_api_json['options']['no_data_timeframe'],
+        silenced: alert_api_json['options']['silenced'],
+        thresholds: alert_api_json['options']['thresholds'],
+        timeout_h: alert_api_json['options']['timeout_h'],
+      }
+
+      new_alert = {
+        monitor_type: normalize_monitor_type(alert['monitor_type']),
+        query: alert['metric']['datadog_query'],
+        message: generate_message(alert['message'], people).strip,
+        evaluation_delay: alert['evaluation_delay'],
+        notify_no_data: alert['notify_no_data'],
+        notify_audit: alert['notify']['audit'],
+        no_data_timeframe: alert['no_data_timeframe'],
+        silenced: alert['silenced'],
+        thresholds: alert['thresholds'],
+        timeout_h: alert['timeout_h'],
+      }
+
+      unless alert['require_full_window'].nil?
+        prev_alert[:require_full_window] = alert_api_json['options']['require_full_window']
+        new_alert[:require_full_window] = alert['require_full_window']
+      end
+
+      prev_alert == new_alert
+    end
+
     def report_stats
       @stats.each do |k, v|
         statsd.gauge("datadog.#{k}", v)
@@ -307,14 +368,6 @@ EOM
       )
     end
 
-    def remove_alert_by_id(alert_id)
-      # This should only be used by dry-run to clean up created dry-run alerts
-      log.debug("deleting alert, id: #{alert_id}")
-      resp = @dog.delete_monitor(alert_id)
-      code = resp[0].to_i
-      log_datadog_response_code(resp, code, :deleting)
-    end
-
     def log_datadog_response_code(resp, code, action, alert = nil)
       # log whenever we've encountered errors
       if code != 200 && !alert.nil?

data/lib/interferon/version.rb

@@ -1,3 +1,3 @@
 module Interferon
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

data/lib/interferon.rb

@@ -106,11 +106,11 @@ module Interferon
           people_count += people.count
         end
 
-        log.info "read #{people_count} people in #{source_groups.count} groups" \
+        log.info "read #{people_count} people in #{source_groups.count} groups " \
                  "from source #{source.class.name}"
       end
 
-      log.info "total of #{groups.values.flatten.count} people in #{groups.count} groups" \
+      log.info "total of #{groups.values.flatten.count} people in #{groups.count} groups " \
                "from #{sources.count} sources"
 
       statsd.gauge('groups.sources', sources.count)
@@ -191,7 +191,7 @@ module Interferon
 
       alerts_queue = build_alerts_queue(hosts, alerts, groups)
       updates_queue = alerts_queue.reject do |_name, alert_people_pair|
-        !Interferon.need_update(dest, alert_people_pair, existing_alerts)
+        !dest.need_update(alert_people_pair, existing_alerts)
       end
 
       # Add dry-run prefix to alerts and delete id to avoid impacting real alerts
@@ -205,7 +205,7 @@ module Interferon
 
       # Build new queue with dry-run prefixes and ensure they are silenced
       alerts_queue.each do |_name, alert_people_pair|
-        alert = alert_people_pair[0]
+        alert, _people = alert_people_pair
         dry_run_alert_name = DRY_RUN_ALERTS_NAME_PREFIX + alert['name']
         alert.change_name(dry_run_alert_name)
         alert.silence
@@ -218,7 +218,7 @@ module Interferon
       # alerts that aren't being generated anymore
       to_remove = existing_alerts.dup
       alerts_queue.each do |_name, alert_people_pair|
-        alert = alert_people_pair[0]
+        alert, _people = alert_people_pair
         old_alerts = to_remove[alert['name']]
 
         next if old_alerts.nil?
@@ -247,7 +247,7 @@ module Interferon
     def do_regular_update(dest, hosts, alerts, existing_alerts, groups)
       alerts_queue = build_alerts_queue(hosts, alerts, groups)
       updates_queue = alerts_queue.reject do |_name, alert_people_pair|
-        !Interferon.need_update(dest, alert_people_pair, existing_alerts)
+        !dest.need_update(alert_people_pair, existing_alerts)
       end
 
       # Create alerts in destination
@@ -257,7 +257,7 @@ module Interferon
       # alerts that aren't being generated anymore
       to_remove = existing_alerts.dup
       alerts_queue.each do |_name, alert_people_pair|
-        alert = alert_people_pair[0]
+        alert, _people = alert_people_pair
         old_alerts = to_remove[alert['name']]
 
         next if old_alerts.nil?
@@ -378,60 +378,5 @@ module Interferon
       end
       alerts_queue
     end
-
-    def self.need_update(dest, alert_people_pair, existing_alerts_from_api)
-      alert = alert_people_pair[0]
-      existing = existing_alerts_from_api[alert['name']]
-      if existing.nil?
-        true
-      else
-        !same_alerts(dest, alert_people_pair, existing)
-      end
-    end
-
-    def self.normalize_monitor_type(monitor_type)
-      # Convert 'query alert' type to 'metric alert' type. They can used interchangeably when
-      # submitting monitors to Datadog. Datadog will automatically do the conversion to 'query
-      # alert' for a "complex" query that includes multiple metrics/tags while using 'metric alert'
-      # for monitors that include a single scope/metric.
-      monitor_type == 'query alert' ? 'metric alert' : monitor_type
-    end
-
-    def self.same_alerts(dest, alert_people_pair, alert_api_json)
-      alert, people = alert_people_pair
-
-      prev_alert = {
-        monitor_type: normalize_monitor_type(alert_api_json['type']),
-        query: alert_api_json['query'].strip,
-        message: alert_api_json['message'].strip,
-        evaluation_delay: alert_api_json['options']['evaluation_delay'],
-        notify_no_data: alert_api_json['options']['notify_no_data'],
-        notify_audit: alert_api_json['options']['notify_audit'],
-        no_data_timeframe: alert_api_json['options']['no_data_timeframe'],
-        silenced: alert_api_json['options']['silenced'],
-        thresholds: alert_api_json['options']['thresholds'],
-        timeout_h: alert_api_json['options']['timeout_h'],
-      }
-
-      new_alert = {
-        monitor_type: normalize_monitor_type(alert['monitor_type']),
-        query: alert['metric']['datadog_query'],
-        message: dest.generate_message(alert['message'], people).strip,
-        evaluation_delay: alert['evaluation_delay'],
-        notify_no_data: alert['notify_no_data'],
-        notify_audit: alert['notify']['audit'],
-        no_data_timeframe: alert['no_data_timeframe'],
-        silenced: alert['silenced'],
-        thresholds: alert['thresholds'],
-        timeout_h: alert['timeout_h'],
-      }
-
-      unless alert['require_full_window'].nil?
-        prev_alert[:require_full_window] = alert_api_json['options']['require_full_window']
-        new_alert[:require_full_window] = alert['require_full_window']
-      end
-
-      prev_alert == new_alert
-    end
   end
 end

data/spec/lib/interferon_spec.rb

@@ -4,7 +4,7 @@ require 'interferon/destinations/datadog'
 
 include Interferon
 
-describe Interferon::Interferon do
+describe Interferon::Destinations::Datadog do
   let(:the_existing_alerts) { mock_existing_alerts }
   let(:dest) { MockDest.new(the_existing_alerts) }
 
@@ -13,35 +13,35 @@ describe Interferon::Interferon do
       alert1 = create_test_alert('name1', 'testquery', 'message1')
       alert2 = mock_alert_json('name2', 'testquery', 'message2')
 
-      expect(Interferon::Interferon.same_alerts(dest, [alert1, []], alert2)).to be false
+      expect(Interferon::Destinations::Datadog.same_alerts(alert1, [], alert2)).to be false
     end
 
     it 'detects a change if datadog query is different' do
       alert1 = create_test_alert('name1', 'testquery1', 'message1')
       alert2 = mock_alert_json('name2', 'testquery2', 'message2')
 
-      expect(Interferon::Interferon.same_alerts(dest, [alert1, []], alert2)).to be false
+      expect(Interferon::Destinations::Datadog.same_alerts(alert1, [], alert2)).to be false
     end
 
     it 'detects a change if alert notify_no_data is different' do
       alert1 = create_test_alert('name1', 'testquery1', 'message1', notify_no_data: false)
       alert2 = mock_alert_json('name2', 'testquery2', 'message2', nil, [1], notify_no_data: true)
 
-      expect(Interferon::Interferon.same_alerts(dest, [alert1, []], alert2)).to be false
+      expect(Interferon::Destinations::Datadog.same_alerts(alert1, [], alert2)).to be false
     end
 
     it 'detects a change if alert silenced is different' do
       alert1 = create_test_alert('name1', 'testquery1', 'message1', silenced: true)
       alert2 = mock_alert_json('name2', 'testquery2', 'message2', nil, [1], silenced: {})
 
-      expect(Interferon::Interferon.same_alerts(dest, [alert1, []], alert2)).to be false
+      expect(Interferon::Destinations::Datadog.same_alerts(alert1, [], alert2)).to be false
     end
 
     it 'detects a change if alert no_data_timeframe is different' do
       alert1 = create_test_alert('name1', 'testquery1', 'message1', no_data_timeframe: nil)
       alert2 = mock_alert_json('name2', 'testquery2', 'message2', nil, [1], no_data_timeframe: 60)
 
-      expect(Interferon::Interferon.same_alerts(dest, [alert1, []], alert2)).to be false
+      expect(Interferon::Destinations::Datadog.same_alerts(alert1, [], alert2)).to be false
     end
 
     it 'detects a change if alert require_full_window is different' do
@@ -50,14 +50,14 @@ describe Interferon::Interferon do
         'name2', 'testquery2', 'message2', nil, [1], require_full_window: true
       )
 
-      expect(Interferon::Interferon.same_alerts(dest, [alert1, []], alert2)).to be false
+      expect(Interferon::Destinations::Datadog.same_alerts(alert1, [], alert2)).to be false
     end
 
     it 'detects a change if alert evaluation_delay is different' do
       alert1 = create_test_alert('name1', 'testquery1', 'message1', evaluation_delay: nil)
       alert2 = mock_alert_json('name2', 'testquery2', 'message2', nil, [1], evaluation_delay: 300)
 
-      expect(Interferon::Interferon.same_alerts(dest, [alert1, []], alert2)).to be false
+      expect(Interferon::Destinations::Datadog.same_alerts(alert1, [], alert2)).to be false
     end
 
     it 'does not detect a change when alert datadog query and message are the same' do
@@ -66,7 +66,7 @@ describe Interferon::Interferon do
         'name1', 'testquery1', "message1\nThis alert was created via the alerts framework"
       )
 
-      expect(Interferon::Interferon.same_alerts(dest, [alert1, []], alert2)).to be true
+      expect(Interferon::Destinations::Datadog.same_alerts(alert1, [], alert2)).to be true
     end
   end
 
@@ -252,7 +252,7 @@ describe Interferon::Interferon do
 
   DEFAULT_OPTIONS = {
     'evaluation_delay' => nil,
-    'notify_audit' => true,
+    'notify_audit' => false,
     'notify_no_data' => false,
     'silenced' => {},
     'thresholds' => nil,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: interferon
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Igor Serebryany
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dogapi