kennel 1.25.2 → 1.25.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ae305a01ea89bad8d057c85b3cc58a49ef5464fe1814a505db3347c985b660a
-  data.tar.gz: c95b134c4a17fde2370c548c22e0bc56bbc416e4d20d30705713d726001f280e
+  metadata.gz: b8cda419aef3ad94847135e75aad4de557482a610fe63882b73b1a6da1bda141
+  data.tar.gz: 37b3682d146e69030a780fb51dfd00575315fed952c4c9cd46d9359176cfd4f7
 SHA512:
-  metadata.gz: 83fabb8313e79a7e845b3c25ceb02d122b8678dc2704b1cd71ffb1ecdac74bcc9ece1d39c398e34f5d74c9653e7482ba4750a0e55d959c795a50dd44158b658c
-  data.tar.gz: 20568a12ab049e0a370d7faaa84ca7737c3a535b1aad699155f993952f19688f344f878787457e1a3ab95a4281660aec5b1bf24a3a2e68163e8491f9c0567791
+  metadata.gz: d9dbac39ce6f2a38e06502395b2659c7ae38d6eee2b53f8b5f85f472ddd339b0b03b7ee4be9c616af82fbf678956e8727a44a1fe29037378554ef691b6d69d8e
+  data.tar.gz: 4b253b0948f18500673b5fb258e5702b28242249f776fd1d5cc245771eaa8a19edb12499268dc035c8537541e1e816f47df7d63025f5d8ddcdb6bbb402732e6d

data/Readme.md

@@ -62,7 +62,8 @@ end
 
 ### Adding a new monitor
  - use [datadog monitor UI](https://app.datadoghq.com/monitors#create/metric) to create a monitor
- - get the `id` from the url, click "Export Monitor" on the monitors edit tab to get the `query` and `type`
+ - get the `id` from the url
+ - `RESOURCE=monitor ID=12345 bundle exec rake kennel:import`
  - see below
 
 ### Updating an existing monitor
@@ -77,7 +78,7 @@ end
         [
           Kennel::Models::Monitor.new(
             self,
-            id: -> { 123456 }, # id from datadog url
+            id: -> { 123456 }, # id from datadog url, not necessary when creating a new monitor
             type: -> { "query alert" },
             kennel_id: -> { "load-too-high" }, # make up a unique name
             name: -> { "Foobar Load too high" }, # nice descriptive name that will show up in alerts and emails
@@ -106,6 +107,7 @@ end
 ### Adding a new dashboard
  - go to [datadog dashboard UI](https://app.datadoghq.com/dash/list) and click on _New Dashboard_ to create a dashboard
  - get the `id` from the url
+ - `RESOURCE=dash ID=12345 bundle exec rake kennel:import`
  - see below
 
 ### Updating an existing dashboard
@@ -119,7 +121,7 @@ end
         [
           Kennel::Models::Dash.new(
             self,
-            id: -> { 123457 }, # id from datadog url
+            id: -> { 123457 }, # id from datadog url, not needed when creating a new dashboard
             title: -> { "My Dashboard" },
             description: -> { "Overview of foobar" },
             template_variables: -> { ["environment"] }, # see https://docs.datadoghq.com/api/?lang=ruby#timeboards
@@ -146,14 +148,6 @@ end
   end
  ```
 
-### Importing an existing resources
-
-```Bash
-RESOURCE=dash ID=12345 rake kennel:import
-```
-
-Put returned definition into a project of your choice.
-
 ### Adding a new screenboard
  - similar to `dash.rb`
  - add to `parts:` list

data/lib/kennel/models/monitor.rb

@@ -9,6 +9,11 @@ module Kennel
       QUERY_INTERVALS = ["1m", "5m", "10m", "15m", "30m", "1h", "2h", "4h", "1d"].freeze
       OPTIONAL_SERVICE_CHECK_THRESHOLDS = [:ok, :warning].freeze
       NON_MULTI_TYPES = ["query alert", "log alert", "composite"].freeze # NOTE: event alerts don't seem to return their multi setting
+      MONITOR_DEFAULTS = {
+        escalation_message: nil,
+        evaluation_delay: nil,
+        no_data_timeframe: nil
+      }.freeze
 
       settings(
         :query, :name, :message, :escalation_message, :critical, :kennel_id, :type, :renotify_interval, :warning, :timeout_h, :evaluation_delay,
@@ -107,7 +112,7 @@ module Kennel
         Utils.path_to_url "/monitors##{id}/edit"
       end
 
-      def self.normalize(_expected, actual)
+      def self.normalize(expected, actual)
         super
         options = actual.fetch(:options)
         options.delete(:silenced) # we do not manage silenced, so ignore it when diffing
@@ -133,6 +138,8 @@ module Kennel
 
         # nil / "" / 0 are not returned from the api when set via the UI
         options[:evaluation_delay] ||= nil
+
+        ignore_default(expected[:options] || {}, options, MONITOR_DEFAULTS)
       end
 
       private

data/lib/kennel/version.rb

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

data/template/Readme.md

@@ -44,7 +44,8 @@ end
 
 ### Adding a new monitor
  - use [datadog monitor UI](https://app.datadoghq.com/monitors#create/metric) to create a monitor
- - get the `id` from the url, click "Export Monitor" on the monitors edit tab to get the `query` and `type`
+ - get the `id` from the url
+ - `RESOURCE=monitor ID=12345 bundle exec rake kennel:import`
  - see below
 
 ### Updating an existing monitor
@@ -59,7 +60,7 @@ end
         [
           Kennel::Models::Monitor.new(
             self,
-            id: -> { 123456 }, # id from datadog url
+            id: -> { 123456 }, # id from datadog url, not necessary when creating a new monitor
             type: -> { "query alert" },
             kennel_id: -> { "load-too-high" }, # make up a unique name
             name: -> { "Foobar Load too high" }, # nice descriptive name that will show up in alerts and emails
@@ -88,6 +89,7 @@ end
 ### Adding a new dashboard
  - go to [datadog dashboard UI](https://app.datadoghq.com/dash/list) and click on _New Dashboard_ to create a dashboard
  - get the `id` from the url
+ - `RESOURCE=dash ID=12345 bundle exec rake kennel:import`
  - see below
 
 ### Updating an existing dashboard
@@ -101,7 +103,7 @@ end
         [
           Kennel::Models::Dash.new(
             self,
-            id: -> { 123457 }, # id from datadog url
+            id: -> { 123457 }, # id from datadog url, not needed when creating a new dashboard
             title: -> { "My Dashboard" },
             description: -> { "Overview of foobar" },
             template_variables: -> { ["environment"] }, # see https://docs.datadoghq.com/api/?lang=ruby#timeboards
@@ -128,14 +130,6 @@ end
   end
  ```
 
-### Importing an existing resources
-
-```Bash
-RESOURCE=dash ID=12345 rake kennel:import
-```
-
-Put returned definition into a project of your choice.
-
 ### Adding a new screenboard
  - similar to `dash.rb`
  - add to `parts:` list

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.25.2
+  version: 1.25.3
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2018-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday