kennel 1.33.0 → 1.33.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59fc72147f8fbc5e6814c42fb0eb98428de06c73ce61bfa6a5d5f51c34eb4125
-  data.tar.gz: a42cc6a71dd4c623ea15f33ae1a6c443943c2a4634d1f693406ad8eba1757ca8
+  metadata.gz: 9cd29b9d1c95396dfb8baf030859d4ba7954f8895cbf252d6993a097057a78b6
+  data.tar.gz: 799443d45fc704d5fc1f6e3d77055e5a03765acb3d39bb1c0a3178b9dd8e0980
 SHA512:
-  metadata.gz: f419ab0130605fee062d418722b53e2b65c90b192661f8922beb0f052ca356159e2a981e08c29e89f8eb579cbb5308a8e47f3214501a12d7109141762b3af6a9
-  data.tar.gz: 2a0ac369b1dfaee83f8accaacce2c9e5a74da8d401d088ddc80988859a8ea3314d0998ff51e447b22c037c17e56f7f1e3414213140c44546d19d5f89d513abc7
+  metadata.gz: 7ce30c2ba6cd55df961aee2b5a1ba220580b86aecc2628f022681241e17a067133ad5705a4eb96cf9bb193c4d35a765e4e32b4788fc5038edda40bd8c15145b0
+  data.tar.gz: '08a052fecd266243e0bb58183b9eedf068912609629cfe3e40c588645a8a18dc16c2ba1a93d63c7fad638d598055e1176c6c99d9cc38eca096b9306ec79dcb2d'

data/lib/kennel/importer.rb

@@ -36,6 +36,7 @@ module Kennel
         # flatten monitor options so they are all on the base
         data.merge!(data.delete(:options))
         data.merge!(data.delete(:thresholds) || {})
+        [:notify_no_data, :notify_audit].each { |k| data.delete(k) if data[k] } # monitor uses true by default
         data = data.slice(*model.instance_methods)
 
         # make query use critical method if it matches

data/lib/kennel/models/monitor.rb

@@ -9,15 +9,15 @@ module Kennel
       QUERY_INTERVALS = ["1m", "5m", "10m", "15m", "30m", "1h", "2h", "4h", "1d"].freeze
       OPTIONAL_SERVICE_CHECK_THRESHOLDS = [:ok, :warning].freeze
       READONLY_ATTRIBUTES = Base::READONLY_ATTRIBUTES + [:multi]
+
+      # defaults that datadog uses when options are not sent, so safe to leave out if our values match their defaults
       MONITOR_OPTION_DEFAULTS = {
         evaluation_delay: nil,
         timeout_h: 0,
         renotify_interval: 120,
-        notify_audit: true,
-        notify_no_data: true,
         no_data_timeframe: nil # this works out ok since if notify_no_data is on, it would never be nil
       }.freeze
-      DEFAULT_ESCALATION_MESAGE = ["", nil].freeze
+      DEFAULT_ESCALATION_MESSAGE = ["", nil].freeze
 
       settings(
         :query, :name, :message, :escalation_message, :critical, :kennel_id, :type, :renotify_interval, :warning, :timeout_h, :evaluation_delay,
@@ -27,14 +27,14 @@ module Kennel
 
       defaults(
         message: -> { "\n\n@slack-#{project.slack}" },
-        escalation_message: -> { DEFAULT_ESCALATION_MESAGE.first },
+        escalation_message: -> { DEFAULT_ESCALATION_MESSAGE.first },
         renotify_interval: -> { MONITOR_OPTION_DEFAULTS.fetch(:renotify_interval) },
         warning: -> { nil },
-        ok: ->  { nil },
-        id: ->  { nil },
-        notify_no_data: -> { MONITOR_OPTION_DEFAULTS.fetch(:notify_no_data) },
+        ok: -> { nil },
+        id: -> { nil },
+        notify_no_data: -> { true },
         no_data_timeframe: -> { notify_no_data ? 60 : nil },
-        notify_audit: -> { MONITOR_OPTION_DEFAULTS.fetch(:notify_audit) },
+        notify_audit: -> { true },
         tags: -> { @project.tags },
         timeout_h: -> { MONITOR_OPTION_DEFAULTS.fetch(:timeout_h) },
         evaluation_delay: -> { MONITOR_OPTION_DEFAULTS.fetch(:evaluation_delay) },
@@ -142,7 +142,7 @@ module Kennel
 
         expected_options = expected[:options] || {}
         ignore_default(expected_options, options, MONITOR_OPTION_DEFAULTS)
-        if DEFAULT_ESCALATION_MESAGE.include?(options[:escalation_message])
+        if DEFAULT_ESCALATION_MESSAGE.include?(options[:escalation_message])
           options.delete(:escalation_message)
           expected_options.delete(:escalation_message)
         end

data/lib/kennel/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kennel
-  VERSION = "1.33.0"
+  VERSION = "1.33.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.33.0
+  version: 1.33.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday