kennel 1.53.1 → 1.54.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a39dd7d2e69ff27625b450457e54c3e57ff2e0950e10f239f6b14d28dc0826b
-  data.tar.gz: 4effd0e4f0428a9e065e7b1e272115356aa352749a7dc11b1aaadf657a6cd81e
+  metadata.gz: ff469d7ae1bcb0d5dc6fb5d867c9dad761b5f2d07159ea147d99620544ec2580
+  data.tar.gz: e3322d92c13faee31f51ef53042cc0c768a0c85cfa0644d4fb2dafcf67f3e03a
 SHA512:
-  metadata.gz: '0930a5440d6c4d7ced1f838d8c5489f8899064b4a7ba8b12dba2a3c7daea71eab51e797667ee8ede2e496200316fe1244f230ed95f9aa12bbcc1ceb5d361ecad'
-  data.tar.gz: 56e685b04a6fb73cfb273d6af73fab31f8daf901266acd7934892fff2dc17113c99cf0f4b70e5d9cca9f4f208fce36bc98f6702b3d027fdb059fe058c40d78d0
+  metadata.gz: 18d054b93d83f78b98dabdd584fcec0a99759f32734c2808c32bb64d51042e3087ca36722c88aa61c24707999f7dbefc1aebdd16ce996c964ba3ca2595bec7df
+  data.tar.gz: d1876da783f71a72287ede64c20c9865622f409ec0857a483161cb1f2914c0e40c3a232165697bee8984ea515d34abfc0beb8eede8b42164d0b324c7805e1468

data/Readme.md

@@ -49,13 +49,16 @@ Keep datadog monitors/dashboards/etc in version control, avoid chaotic managemen
 
 ### 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>`)
+
 ```Ruby
 # teams/my_team.rb
 module Teams
   class MyTeam < Kennel::Models::Team
     defaults(
-      slack: -> { "my-alerts" }, # where to send alerts
-      email: -> { "my-team@example.com" } # optional
+      mention: -> { "@slack-my-team" }
     )
   end
 end
@@ -158,12 +161,6 @@ end
 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.
 
-### Monitor re-notification
-
-Monitors inherit the re-notification setting from their `project.team`.
-Set this to for example `renotify_interval: -> { 120 }` minutes,
-to make alerts not get ignored by popping back up if they are still alerting.
-
 ### Linking with kennel_ids
 
 To link to existing monitors via their kennel_id
@@ -206,7 +203,7 @@ Reuse it in multiple projects.
 ```Ruby
 class Database < Kennel::Models::Project
   defaults(
-    team: -> { Kennel::Models::Team.new(slack: -> { 'foo' }, kennel_id: -> { 'foo' }) },
+    team: -> { Kennel::Models::Team.new(mention: -> { '@slack-foo' }, kennel_id: -> { 'foo' }) },
     parts: -> { [Monitors::LoadTooHigh.new(self, critical: -> { 13 })] }
   )
 end

data/lib/kennel/models/monitor.rb

@@ -27,7 +27,7 @@ module Kennel
       )
 
       defaults(
-        message: -> { "\n\n@slack-#{project.slack}" },
+        message: -> { "\n\n#{project.mention}" },
         escalation_message: -> { DEFAULT_ESCALATION_MESSAGE.first },
         renotify_interval: -> { project.team.renotify_interval },
         warning: -> { nil },

data/lib/kennel/models/project.rb

@@ -2,10 +2,10 @@
 module Kennel
   module Models
     class Project < Base
-      settings :team, :parts, :tags, :slack
+      settings :team, :parts, :tags, :mention
       defaults(
         tags: -> { ["service:#{kennel_id}"] + team.tags },
-        slack: -> { team.slack }
+        mention: -> { team.mention }
       )
 
       def self.file_location

data/lib/kennel/models/team.rb

@@ -2,20 +2,11 @@
 module Kennel
   module Models
     class Team < Base
-      settings :slack, :email, :tags, :renotify_interval, :kennel_id
+      settings :mention, :tags, :renotify_interval, :kennel_id
       defaults(
         tags: -> { ["team:#{kennel_id.sub(/^teams_/, "")}"] },
         renotify_interval: -> { 0 }
       )
-
-      def initialize(*)
-        super
-        invalid! "remove leading # from slack" if slack.to_s.start_with?("#")
-      end
-
-      def tracking_id
-        kennel_id
-      end
     end
   end
 end

data/lib/kennel/version.rb

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

data/template/Readme.md

@@ -31,13 +31,16 @@ Keep datadog monitors/dashboards/etc in version control, avoid chaotic managemen
 
 ### 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>`)
+
 ```Ruby
 # teams/my_team.rb
 module Teams
   class MyTeam < Kennel::Models::Team
     defaults(
-      slack: -> { "my-alerts" }, # where to send alerts
-      email: -> { "my-team@example.com" } # optional
+      mention: -> { "@slack-my-team" }
     )
   end
 end
@@ -140,12 +143,6 @@ end
 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.
 
-### Monitor re-notification
-
-Monitors inherit the re-notification setting from their `project.team`.
-Set this to for example `renotify_interval: -> { 120 }` minutes,
-to make alerts not get ignored by popping back up if they are still alerting.
-
 ### Linking with kennel_ids
 
 To link to existing monitors via their kennel_id
@@ -188,7 +185,7 @@ Reuse it in multiple projects.
 ```Ruby
 class Database < Kennel::Models::Project
   defaults(
-    team: -> { Kennel::Models::Team.new(slack: -> { 'foo' }, kennel_id: -> { 'foo' }) },
+    team: -> { Kennel::Models::Team.new(mention: -> { '@slack-foo' }, kennel_id: -> { 'foo' }) },
     parts: -> { [Monitors::LoadTooHigh.new(self, critical: -> { 13 })] }
   )
 end

metadata

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