kennel 1.96.1 → 1.98.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aca7576bcde423ec1f4e559d88f13ee64ed5efb116a212f49e67ac6b792ddb16
-  data.tar.gz: a6b60f7d6a73ca82d2478f565435e0ebb95a79f7d3bd5bcebfd6712a3e9c8cfb
+  metadata.gz: 4d0b70ee90aae5a476b1e9a324e02346856e9d76881082d46a2b219efcfe2267
+  data.tar.gz: 86bc3f4777ec06a9b8c171e93ea95b50e9117a74283e3e6c1785d81e87889a4d
 SHA512:
-  metadata.gz: 1767ebe1e61ea9a314b99f14a2cd15a31dc09419dafa2a9100244c83acfc40cd9eba0ccf1e9ad6c4cf9c3026cd1493e6b62cdc6a867b18720ed517908e702768
-  data.tar.gz: 382486fbfb3c52346262ad43c63ed21164676189a880d405914de54539907a0a193960f173daa9aa16f41d847959b140a9c60cee886f85d63473d599bd00b807
+  metadata.gz: d0c6f38a11af7b0876a5637648fe16168aa4c5f6a16bba06f51322c240b02d520bd3abf566bf04b547df7431453d500f97be06b3a03da850ca5395b6ccf04bed
+  data.tar.gz: 45a77a1b2995f12da465a5b2ed64c6f21c93dba68b154367cf06c2a88202b648e223f0f1f80da7052e536b64f66a3cdc72a607fabfb913db3c7657f9e4000051

data/Readme.md

@@ -16,7 +16,6 @@ Manage Datadog Monitors / Dashboards / Slos as code
 ![](template/github/screen.png?raw=true)
 
 ### Example code
-
 ```Ruby
 # teams/foo.rb
 module Teams
@@ -52,9 +51,7 @@ end
 ```
 
 <!-- NOT IN template/Readme.md  -->
-
 ## Installation
-
  - create a new private `kennel` repo for your organization (do not fork this repo)
  - use the template folder as starting point:
     ```Bash
@@ -70,14 +67,12 @@ end
 <!-- NOT IN -->
 
 ## Structure
-
  - `projects/` monitors/dashboards/etc scoped by project
  - `teams/` team definitions
  - `parts/` monitors/dashboards/etc that are used by multiple projects
  - `generated/` projects as json, to show current state and proposed changes in PRs
 
 ## Workflows
-
 <!-- ONLY IN template/Readme.md
 ### Setup
  - clone the repo
@@ -91,7 +86,6 @@ end
 -->
 
 ### Adding a team
-
  - `mention` is used for all team monitors via `super()`
  - `renotify_interval` is used for all team monitors (defaults to `0` / off)
  - `tags` is used for all team monitors/dashboards (defaults to `team:<team-name>`)
@@ -208,14 +202,30 @@ When manually creating to import, it is best to remove the `id` and delete the m
 When an `id` is set and the original resource is deleted, kennel will fail to update,
 removing the `id` will cause kennel to create a new resource in datadog.
 
+### Organizing large sub-projects / large organiations
+Having many projects (and their sub-resources) can quickly get out of hand.
 
-### Skipping validations
+Use this class structure to keep things organized:
+```ruby
+# projects/project_a/base.rb
+module ProjectA
+  class Base < Kennel::Models::Project
+    defaults(
+      kennel_id: -> { "project_a" },
+      ...
+
+# projects/project_a/monitors/foo_alert.rb
+module ProjectA
+  module Monitors
+    class FooAlert < Kennel::Modesl::Monitor
+      ...
+```
 
+### Skipping validations
 Some validations might be too strict for your usecase or just wrong, please [open an issue](https://github.com/grosser/kennel/issues) and
 to unblock use the `validate: -> { false }` option.
 
 ### Linking resources with kennel_id
-
 Link resources with their kennel_id in the format `project kennel_id` + `:` + `resource kennel_id`,
 this should be used to create dependent resources like monitor + slos,
 so they can be created in a single update and can be re-created if any of them is deleted.
@@ -230,13 +240,11 @@ so they can be created in a single update and can be re-created if any of them i
 |Slo|monitor|`monitor_ids: -> ["foo:bar"]`|
 
 ### Debugging changes locally
-
  - rebase on updated `master` to not undo other changes
  - figure out project name by converting the class name to snake-case
  - run `PROJECT=foo bundle exec rake kennel:update_datadog` to test changes for a single project (monitors: remove mentions while debugging to avoid alert spam)
 
 ### Reuse
-
 Add to `parts/<folder>`.
 
 ```Ruby
@@ -266,15 +274,12 @@ end
 ## Helpers
 
 ### Listing un-muted alerts
-
 Run `rake kennel:alerts TAG=service:my-service` to see all un-muted alerts for a given datadog monitor tag.
 
 ### Validating mentions work
-
 `rake kennel:validate_mentions` should run as part of CI
 
 ### Grepping through all of datadog
-
 ```Bash
 rake kennel:dump > tmp/dump
 cat tmp/dump | grep foo
@@ -289,7 +294,6 @@ https://foo.datadog.com/monitor/123
 ```
 
 ### Find all monitors with No-Data
-
 `rake kennel:nodata TAG=team:foo`
 
 <!-- NOT IN template/Readme.md -->
@@ -297,11 +301,9 @@ https://foo.datadog.com/monitor/123
 ## Development
 
 ### Benchmarking
-
 Setting `FORCE_GET_CACHE=true` will cache all get requests, which makes benchmarking improvements more reliable.
 
 ### Integration testing
-
 ```Bash
 rake play
 cd template

data/lib/kennel/models/monitor.rb

@@ -31,7 +31,7 @@ module Kennel
       settings(
         :query, :name, :message, :escalation_message, :critical, :type, :renotify_interval, :warning, :timeout_h, :evaluation_delay,
         :ok, :no_data_timeframe, :notify_no_data, :notify_audit, :tags, :critical_recovery, :warning_recovery, :require_full_window,
-        :threshold_windows, :new_host_delay, :priority
+        :threshold_windows, :new_host_delay, :new_group_delay, :priority
       )
 
       defaults(
@@ -45,6 +45,7 @@ module Kennel
         no_data_timeframe: -> { 60 },
         notify_audit: -> { MONITOR_OPTION_DEFAULTS.fetch(:notify_audit) },
         new_host_delay: -> { MONITOR_OPTION_DEFAULTS.fetch(:new_host_delay) },
+        new_group_delay: -> { nil },
         tags: -> { @project.tags },
         timeout_h: -> { MONITOR_OPTION_DEFAULTS.fetch(:timeout_h) },
         evaluation_delay: -> { MONITOR_OPTION_DEFAULTS.fetch(:evaluation_delay) },
@@ -70,6 +71,7 @@ module Kennel
             notify_audit: notify_audit,
             require_full_window: require_full_window,
             new_host_delay: new_host_delay,
+            new_group_delay: new_group_delay,
             include_tags: true,
             escalation_message: Utils.presence(escalation_message.strip),
             evaluation_delay: evaluation_delay,
@@ -106,6 +108,9 @@ module Kennel
           options[:threshold_windows] = windows
         end
 
+        # Datadog requires only either new_group_delay or new_host_delay, never both
+        options.delete(options[:new_group_delay] ? :new_host_delay : :new_group_delay)
+
         validate_json(data) if validate
 
         @as_json = data

data/lib/kennel/models/project.rb

@@ -2,7 +2,7 @@
 module Kennel
   module Models
     class Project < Base
-      settings :team, :parts, :tags, :mention
+      settings :team, :parts, :tags, :mention, :name, :kennel_id
       defaults(
         tags: -> { ["service:#{kennel_id}"] + team.tags },
         mention: -> { team.mention }

data/lib/kennel/version.rb

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

data/template/Readme.md

@@ -16,7 +16,6 @@ Manage Datadog Monitors / Dashboards / Slos as code
 ![](github/screen.png?raw=true)
 
 ### Example code
-
 ```Ruby
 # teams/foo.rb
 module Teams
@@ -53,14 +52,12 @@ end
 
 
 ## Structure
-
  - `projects/` monitors/dashboards/etc scoped by project
  - `teams/` team definitions
  - `parts/` monitors/dashboards/etc that are used by multiple projects
  - `generated/` projects as json, to show current state and proposed changes in PRs
 
 ## Workflows
-
 ### Setup
  - clone the repo
  - `gem install bundler && bundle install`
@@ -72,7 +69,6 @@ end
  - verify it works by running `rake plan`, it might show some diff, but should not crash
 
 ### Adding a team
-
  - `mention` is used for all team monitors via `super()`
  - `renotify_interval` is used for all team monitors (defaults to `0` / off)
  - `tags` is used for all team monitors/dashboards (defaults to `team:<team-name>`)
@@ -189,14 +185,30 @@ When manually creating to import, it is best to remove the `id` and delete the m
 When an `id` is set and the original resource is deleted, kennel will fail to update,
 removing the `id` will cause kennel to create a new resource in datadog.
 
+### Organizing large sub-projects / large organiations
+Having many projects (and their sub-resources) can quickly get out of hand.
 
-### Skipping validations
+Use this class structure to keep things organized:
+```ruby
+# projects/project_a/base.rb
+module ProjectA
+  class Base < Kennel::Models::Project
+    defaults(
+      kennel_id: -> { "project_a" },
+      ...
+
+# projects/project_a/monitors/foo_alert.rb
+module ProjectA
+  module Monitors
+    class FooAlert < Kennel::Modesl::Monitor
+      ...
+```
 
+### Skipping validations
 Some validations might be too strict for your usecase or just wrong, please [open an issue](https://github.com/grosser/kennel/issues) and
 to unblock use the `validate: -> { false }` option.
 
 ### Linking resources with kennel_id
-
 Link resources with their kennel_id in the format `project kennel_id` + `:` + `resource kennel_id`,
 this should be used to create dependent resources like monitor + slos,
 so they can be created in a single update and can be re-created if any of them is deleted.
@@ -211,13 +223,11 @@ so they can be created in a single update and can be re-created if any of them i
 |Slo|monitor|`monitor_ids: -> ["foo:bar"]`|
 
 ### Debugging changes locally
-
  - rebase on updated `master` to not undo other changes
  - figure out project name by converting the class name to snake-case
  - run `PROJECT=foo bundle exec rake kennel:update_datadog` to test changes for a single project (monitors: remove mentions while debugging to avoid alert spam)
 
 ### Reuse
-
 Add to `parts/<folder>`.
 
 ```Ruby
@@ -247,15 +257,12 @@ end
 ## Helpers
 
 ### Listing un-muted alerts
-
 Run `rake kennel:alerts TAG=service:my-service` to see all un-muted alerts for a given datadog monitor tag.
 
 ### Validating mentions work
-
 `rake kennel:validate_mentions` should run as part of CI
 
 ### Grepping through all of datadog
-
 ```Bash
 rake kennel:dump > tmp/dump
 cat tmp/dump | grep foo
@@ -270,6 +277,5 @@ https://foo.datadog.com/monitor/123
 ```
 
 ### Find all monitors with No-Data
-
 `rake kennel:nodata TAG=team:foo`
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.96.1
+  version: 1.98.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2021-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday