kennel 1.50.0 → 1.53.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3cb84b8e35c48c089b3f355988bb8fff0f7d1c03ce863fe68bf77cd94622703
-  data.tar.gz: 79fb571d0ebfe6152ce269377af8d808a25b549cc0fdf0ee2b52b4f92b243d61
+  metadata.gz: 6a39dd7d2e69ff27625b450457e54c3e57ff2e0950e10f239f6b14d28dc0826b
+  data.tar.gz: 4effd0e4f0428a9e065e7b1e272115356aa352749a7dc11b1aaadf657a6cd81e
 SHA512:
-  metadata.gz: 20087313f79d2ac2f019ccefd341731c6ede13d2df75e4c06eca980d67fd672727c72253a32c1e30f54c81d20f60c5944f22b31fac69e534f412149ca632e907
-  data.tar.gz: 062a7e8269ba9bacec21e271cdb42208b4c93b6a6d478bb78895cd82969a88fcb4b4528a5a5e967a2d17052bc5d93120999e08e4f80963d0673a768ea906cbf7
+  metadata.gz: '0930a5440d6c4d7ced1f838d8c5489f8899064b4a7ba8b12dba2a3c7daea71eab51e797667ee8ede2e496200316fe1244f230ed95f9aa12bbcc1ceb5d361ecad'
+  data.tar.gz: 56e685b04a6fb73cfb273d6af73fab31f8daf901266acd7934892fff2dc17113c99cf0f4b70e5d9cca9f4f208fce36bc98f6702b3d027fdb059fe058c40d78d0

data/Readme.md

@@ -42,8 +42,9 @@ Keep datadog monitors/dashboards/etc in version control, avoid chaotic managemen
  - `gem install bundler && bundle install`
  - `cp .env.example .env`
  - open [Datadog API Settings](https://app.datadoghq.com/account/settings#api)
- - find or create your personal "Application Key" and add it to `.env` as `DATADOG_APP_KEY=` (will be on the last page if new)
  - copy any `API Key` and add it to `.env` as `DATADOG_API_KEY`
+ - find or create your personal "Application Key" and add it to `.env` as `DATADOG_APP_KEY=` (will be on the last page if new)
+ - change the `DATADOG_SUBDOMAIN=app` in `.env` to your companies subdomain if you have one
 -->
 
 ### Adding a team
@@ -53,8 +54,8 @@ Keep datadog monitors/dashboards/etc in version control, avoid chaotic managemen
 module Teams
   class MyTeam < Kennel::Models::Team
     defaults(
-      slack: -> { "my-alerts" },
-      email: -> { "my-team@example.com" }
+      slack: -> { "my-alerts" }, # where to send alerts
+      email: -> { "my-team@example.com" } # optional
     )
   end
 end
@@ -62,13 +63,14 @@ 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
- - `RESOURCE=monitor ID=12345 bundle exec rake kennel:import`
  - see below
 
 ### Updating an existing monitor
+ - use [datadog monitor UI](https://app.datadoghq.com/monitors#create/metric) to find a monitor
+ - get the `id` from the url
+ - run `RESOURCE=monitor ID=12345 bundle exec rake kennel:import` and copy the output
  - find or create a project in `projects/`
- - add a monitor to `parts: [` list
+ - add the monitor to `parts: [` list, for example:
   ```Ruby
   # projects/my_project.rb
   class MyProject < Kennel::Models::Project
@@ -83,7 +85,8 @@ end
             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
             message: -> {
-              # Explain what behavior to expect and how to fix the cause. Use #{super()} to add team notifications.
+              # Explain what behavior to expect and how to fix the cause
+              # Use #{super()} to add team notifications.
               <<~TEXT
                 Foobar will be slow and that could cause Barfoo to go down.
                 Add capacity or debug why it is suddenly slow.
@@ -98,21 +101,22 @@ end
     )
   end
   ```
- - `bundle exec rake plan` update to existing should be shown (not Create / Delete)
- - alternatively: `bundle exec rake generate` to only update the generated `json` files
+ - run `PROJECT=my_project bundle exec rake plan`, an Update to the existing monitor should be shown (not Create / Delete)
+ - alternatively: `bundle exec rake generate` to only locally update the generated `json` files
  - review changes then `git commit`
  - make a PR ... get reviewed ... merge
  - datadog is updated by travis
 
 ### Adding a new dashboard
  - go to [datadog dashboard UI](https://app.datadoghq.com/dashboard/lists) and click on _New Dashboard_ to create a dashboard
- - get the `id` from the url
- - `RESOURCE=dashboard ID=abc-def-ghi bundle exec rake kennel:import`
  - see below
 
 ### Updating an existing dashboard
+ - go to [datadog dashboard UI](https://app.datadoghq.com/dashboard/lists) and click on _New Dashboard_ to find a dashboard
+ - get the `id` from the url
+ - run `RESOURCE=dashboard ID=abc-def-ghi bundle exec rake kennel:import` and copy the output
  - find or create a project in `projects/`
- - add a dashboard to `parts: [` list
+ - add a dashboard to `parts: [` list, for example:
   ```Ruby
   class MyProject < Kennel::Models::Project
     defaults(
@@ -154,12 +158,19 @@ 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
 
  - Screens `uptime` widgets can use `monitor: {id: "foo:bar"}`
  - Screens `alert_graph` widgets can use `alert_id: "foo:bar"`
+ - Monitors `composite` can use `query: -> { "%{foo:bar} || %{foo:baz}" }`
 
 ### Debugging changes locally
 

data/lib/kennel/importer.rb

@@ -53,6 +53,9 @@ module Kennel
         if query && critical
           query.sub!(/([><=]) (#{Regexp.escape(critical.to_f.to_s)}|#{Regexp.escape(critical.to_i.to_s)})$/, "\\1 \#{critical}")
         end
+      elsif resource == "dashboard"
+        widgets = data[:widgets]&.flat_map { |widget| widget.dig(:definition, :widgets) || [widget] }
+        widgets&.each { |widget| dry_up_query!(widget) }
       end
 
       # simplify template_variables to array of string when possible
@@ -71,6 +74,20 @@ module Kennel
 
     private
 
+    # reduce duplication in imports by using dry `q: :metadata` when possible
+    def dry_up_query!(widget)
+      (widget.dig(:definition, :requests) || []).each do |request|
+        next unless request.is_a?(Hash)
+        next unless metadata = request[:metadata]
+        next unless query = request[:q]&.dup
+        metadata.each do |m|
+          next unless exp = m[:expression]
+          query.sub!(exp, "")
+        end
+        request[:q] = :metadata if query.delete(", ") == ""
+      end
+    end
+
     def pretty_print(hash)
       sort_widgets hash
 
@@ -84,6 +101,7 @@ module Kennel
               .gsub(/(^\s*)"([a-zA-Z][a-zA-Z\d_]*)":/, "\\1\\2:") # "foo": 1 -> foo: 1
               .gsub(/: \[\n\s+\]/, ": []") # empty arrays on a single line
               .gsub(/^/, "    ") # indent
+              .gsub('q: "metadata"', "q: :metadata") # bring symbols back
 
             "\n#{pretty}\n  "
           elsif k == :message

data/lib/kennel/models/base.rb

@@ -148,6 +148,13 @@ module Kennel
 
       private
 
+      def resolve_link(id, id_map, force:)
+        id_map[id] || begin
+          message = "Unable to find #{id} in existing monitors (they need to be created first to link them)"
+          force ? invalid!(message) : Kennel.err.puts(message)
+        end
+      end
+
       # let users know which project/resource failed when something happens during diffing where the backtrace is hidden
       def invalid!(message)
         raise ValidationError, "#{tracking_id} #{message}"

data/lib/kennel/models/dashboard.rb

@@ -39,7 +39,7 @@ module Kennel
             pair.each do |b|
               b[:widgets]&.each do |w|
                 if formats = w.dig(:definition, :conditional_formats)
-                  w[:definition][:conditional_formats] = formats.sort_by { |h| h[:value].to_f }
+                  w[:definition][:conditional_formats] = formats.sort_by(&:hash)
                 end
               end
             end
@@ -101,11 +101,13 @@ module Kennel
           case definition[:type]
           when "uptime"
             if ids = definition[:monitor_ids]
-              definition[:monitor_ids] = ids.map { |id| resolve_link(id, id_map) }
+              definition[:monitor_ids] = ids.map do |id|
+                tracking_id?(id) ? resolve_link(id, id_map, force: false) : id
+              end
             end
           when "alert_graph"
-            if id = definition[:alert_id]
-              definition[:alert_id] = resolve_link(id, id_map).to_s
+            if (id = definition[:alert_id]) && tracking_id?(id)
+              definition[:alert_id] = resolve_link(id, id_map, force: false).to_s
             end
           end
         end
@@ -113,6 +115,10 @@ module Kennel
 
       private
 
+      def tracking_id?(id)
+        id.is_a?(String) && !id.match?(/\A\d+\z/)
+      end
+
       # creates queries from metadata to avoid having to keep q and expression in sync
       #
       # {q: :metadata, metadata: [{expression: "sum:bar", alias_name: "foo"}, ...], }
@@ -127,16 +133,6 @@ module Kennel
         end
       end
 
-      def resolve_link(id, id_map)
-        return id unless tracking_id?(id)
-        id_map[id] ||
-          Kennel.err.puts("Unable to find #{id} in existing monitors (they need to be created first to link them)")
-      end
-
-      def tracking_id?(id)
-        id.is_a?(String) && !id.match?(/\A\d+\z/)
-      end
-
       def validate_json(data)
         super
 

data/lib/kennel/models/monitor.rb

@@ -15,7 +15,7 @@ module Kennel
         evaluation_delay: nil,
         new_host_delay: 300,
         timeout_h: 0,
-        renotify_interval: 120,
+        renotify_interval: 0,
         no_data_timeframe: nil # this works out ok since if notify_no_data is on, it would never be nil
       }.freeze
       DEFAULT_ESCALATION_MESSAGE = ["", nil].freeze
@@ -29,7 +29,7 @@ module Kennel
       defaults(
         message: -> { "\n\n@slack-#{project.slack}" },
         escalation_message: -> { DEFAULT_ESCALATION_MESSAGE.first },
-        renotify_interval: -> { MONITOR_OPTION_DEFAULTS.fetch(:renotify_interval) },
+        renotify_interval: -> { project.team.renotify_interval },
         warning: -> { nil },
         ok: -> { nil },
         id: -> { nil },
@@ -108,6 +108,16 @@ module Kennel
         @as_json = data
       end
 
+      # resolve composite monitors ... only works when referenced monitors already exist
+      # since leaving names or bad ids in the query breaks the monitor update
+      def resolve_linked_tracking_ids(id_map)
+        if as_json[:type] == "composite"
+          as_json[:query] = as_json[:query].gsub(/%\{(.*?)\}/) do
+            resolve_link($1, id_map, force: true)
+          end
+        end
+      end
+
       def self.api_resource
         "monitor"
       end

data/lib/kennel/models/team.rb

@@ -2,9 +2,10 @@
 module Kennel
   module Models
     class Team < Base
-      settings :slack, :email, :tags, :kennel_id
+      settings :slack, :email, :tags, :renotify_interval, :kennel_id
       defaults(
-        tags: -> { ["team:#{kennel_id.sub(/^teams_/, "")}"] }
+        tags: -> { ["team:#{kennel_id.sub(/^teams_/, "")}"] },
+        renotify_interval: -> { 0 }
       )
 
       def initialize(*)

data/lib/kennel/syncer.rb

@@ -72,11 +72,22 @@ module Kennel
         filter_by_project! actual
 
         details_cache do |cache|
-          actual.each do |a|
-            id = a.fetch(:id)
+          items = actual.map do |a|
             e = matching_expected(a)
             if e && @expected.delete(e)
-              fill_details(a, cache) if e.class::API_LIST_INCOMPLETE
+              [e, a]
+            else
+              [nil, a]
+            end
+          end
+
+          # fill details of things we need to compare (only do this part in parallel for safety & balancing)
+          Utils.parallel(items.select { |e, _| e && e.class::API_LIST_INCOMPLETE }) { |_, a| fill_details(a, cache) }
+
+          # pick out things to update or delete
+          items.each do |e, a|
+            id = a.fetch(:id)
+            if e
               diff = e.diff(a)
               @update << [id, e, a, diff] if diff.any?
             elsif tracking_id(a) # was previously managed

data/lib/kennel/version.rb

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

data/template/Readme.md

@@ -25,8 +25,9 @@ Keep datadog monitors/dashboards/etc in version control, avoid chaotic managemen
  - `gem install bundler && bundle install`
  - `cp .env.example .env`
  - open [Datadog API Settings](https://app.datadoghq.com/account/settings#api)
- - find or create your personal "Application Key" and add it to `.env` as `DATADOG_APP_KEY=` (will be on the last page if new)
  - copy any `API Key` and add it to `.env` as `DATADOG_API_KEY`
+ - find or create your personal "Application Key" and add it to `.env` as `DATADOG_APP_KEY=` (will be on the last page if new)
+ - change the `DATADOG_SUBDOMAIN=app` in `.env` to your companies subdomain if you have one
 
 ### Adding a team
 
@@ -35,8 +36,8 @@ Keep datadog monitors/dashboards/etc in version control, avoid chaotic managemen
 module Teams
   class MyTeam < Kennel::Models::Team
     defaults(
-      slack: -> { "my-alerts" },
-      email: -> { "my-team@example.com" }
+      slack: -> { "my-alerts" }, # where to send alerts
+      email: -> { "my-team@example.com" } # optional
     )
   end
 end
@@ -44,13 +45,14 @@ 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
- - `RESOURCE=monitor ID=12345 bundle exec rake kennel:import`
  - see below
 
 ### Updating an existing monitor
+ - use [datadog monitor UI](https://app.datadoghq.com/monitors#create/metric) to find a monitor
+ - get the `id` from the url
+ - run `RESOURCE=monitor ID=12345 bundle exec rake kennel:import` and copy the output
  - find or create a project in `projects/`
- - add a monitor to `parts: [` list
+ - add the monitor to `parts: [` list, for example:
   ```Ruby
   # projects/my_project.rb
   class MyProject < Kennel::Models::Project
@@ -65,7 +67,8 @@ end
             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
             message: -> {
-              # Explain what behavior to expect and how to fix the cause. Use #{super()} to add team notifications.
+              # Explain what behavior to expect and how to fix the cause
+              # Use #{super()} to add team notifications.
               <<~TEXT
                 Foobar will be slow and that could cause Barfoo to go down.
                 Add capacity or debug why it is suddenly slow.
@@ -80,21 +83,22 @@ end
     )
   end
   ```
- - `bundle exec rake plan` update to existing should be shown (not Create / Delete)
- - alternatively: `bundle exec rake generate` to only update the generated `json` files
+ - run `PROJECT=my_project bundle exec rake plan`, an Update to the existing monitor should be shown (not Create / Delete)
+ - alternatively: `bundle exec rake generate` to only locally update the generated `json` files
  - review changes then `git commit`
  - make a PR ... get reviewed ... merge
  - datadog is updated by travis
 
 ### Adding a new dashboard
  - go to [datadog dashboard UI](https://app.datadoghq.com/dashboard/lists) and click on _New Dashboard_ to create a dashboard
- - get the `id` from the url
- - `RESOURCE=dashboard ID=abc-def-ghi bundle exec rake kennel:import`
  - see below
 
 ### Updating an existing dashboard
+ - go to [datadog dashboard UI](https://app.datadoghq.com/dashboard/lists) and click on _New Dashboard_ to find a dashboard
+ - get the `id` from the url
+ - run `RESOURCE=dashboard ID=abc-def-ghi bundle exec rake kennel:import` and copy the output
  - find or create a project in `projects/`
- - add a dashboard to `parts: [` list
+ - add a dashboard to `parts: [` list, for example:
   ```Ruby
   class MyProject < Kennel::Models::Project
     defaults(
@@ -136,12 +140,19 @@ 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
 
  - Screens `uptime` widgets can use `monitor: {id: "foo:bar"}`
  - Screens `alert_graph` widgets can use `alert_id: "foo:bar"`
+ - Monitors `composite` can use `query: -> { "%{foo:bar} || %{foo:baz}" }`
 
 ### Debugging changes locally
 

metadata

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