kennel 1.100.0 → 1.103.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97207492f3f5afd31ab4d3b16db46f8b70a772c101c57bc26c7d135c9ece6a75
-  data.tar.gz: 6a2c515b9116f1da7764a0a509886fee28ec36241e982b425843f6bc64c02067
+  metadata.gz: 1325abc55c593c6537608b629a7a98de7ce05487bc3a066782bb1be1164268dd
+  data.tar.gz: 966282e916764aaaae5b6718a72d4070070d1ad3c2f6a43bbdf01c10e325d63c
 SHA512:
-  metadata.gz: a4304111e6d35d92ed2b1adbba277a39eb67e7b2e697a5b2cbd031731a1aa968477249f13a18377f7ea4af49bfafd8742060a3ab6c7b7161bb78fd9b63889972
-  data.tar.gz: 8a5588b35ef64e8a91354a5554866f5a59ca354d850ecd96c7d2d164cf79ffe8f6b8cf79ff0c3bc5d4108cba4a600211492ccd0c7033725dc3e2c0a4197e55ef
+  metadata.gz: fec764b934ecad2aa76a9282eb937ceef1774d19d50b56d1597846c04afd050dac9fcc51566618169929eb0da77c25d6eb3ac18c9993872229d5404b5d6e3127
+  data.tar.gz: 85201a83ceed329e4bf71b4392ec086c3d18714d5f76eda00dbe2fa6a7e05482523b91e40405241241666f9982eddb5c167bd6b3bd9448a56d39f30392ccadba

data/lib/kennel/id_map.rb

@@ -15,10 +15,6 @@ module Kennel
       @map[type][tracking_id] = id
     end
 
-    def set_new(type, tracking_id)
-      @map[type][tracking_id] = NEW
-    end
-
     def new?(type, tracking_id)
       @map[type][tracking_id] == NEW
     end

data/lib/kennel/syncer.rb

@@ -18,6 +18,7 @@ module Kennel
       if noop?
         Kennel.out.puts Utils.color(:green, "Nothing to do")
       else
+        @warnings.each { |message| Kennel.out.puts Utils.color(:yellow, "Warning: #{message}") }
         print_plan "Create", @create, :green
         print_plan "Update", @update, :yellow
         print_plan "Delete", @delete, :red
@@ -120,6 +121,7 @@ module Kennel
     end
 
     def calculate_diff
+      @warnings = []
       @update = []
       @delete = []
       @id_map = IdMap.new
@@ -181,7 +183,11 @@ module Kennel
       @expected.each do |e|
         next unless id = e.id
         resource = e.class.api_resource
-        raise "Unable to find existing #{resource} with id #{id}\nIf the #{resource} was deleted, remove the `id: -> { #{e.id} }` line."
+        if Kennel.strict_imports
+          raise "Unable to find existing #{resource} with id #{id}\nIf the #{resource} was deleted, remove the `id: -> { #{id} }` line."
+        else
+          @warnings << "#{resource} #{e.tracking_id} specifies id #{id}, but no such #{resource} exists. 'id' will be ignored. Remove the `id: -> { #{id} }` line."
+        end
       end
     end
 
@@ -254,13 +260,28 @@ module Kennel
     end
 
     def populate_id_map(expected, actual)
+      # mark everything as new
       expected.each do |e|
-        @id_map.set_new(e.class.api_resource, e.tracking_id)
+        @id_map.set(e.class.api_resource, e.tracking_id, IdMap::NEW)
+        if e.class.api_resource == "synthetics/tests"
+          @id_map.set(Kennel::Models::Monitor.api_resource, e.tracking_id, IdMap::NEW)
+        end
       end
 
+      # override resources that exist with their id
+      project_prefix = @project_filter && "#{@project_filter}:"
       actual.each do |a|
+        # ignore when not managed by kennel
         next unless tracking_id = a.fetch(:tracking_id)
-        @id_map.set(a.fetch(:klass).api_resource, tracking_id, a.fetch(:id))
+
+        # ignore when deleted from the codebase
+        # (when running with project filter we cannot see the other resources in the codebase)
+        api_resource = a.fetch(:klass).api_resource
+        next if
+          !@id_map.get(api_resource, tracking_id) &&
+          (!project_prefix || tracking_id.start_with?(project_prefix))
+
+        @id_map.set(api_resource, tracking_id, a.fetch(:id))
         if a[:klass].api_resource == "synthetics/tests"
           @id_map.set(Kennel::Models::Monitor.api_resource, tracking_id, a.fetch(:monitor_id))
         end

data/lib/kennel/tasks.rb

@@ -3,6 +3,7 @@ require "English"
 require "kennel"
 require "kennel/unmuted_alerts"
 require "kennel/importer"
+require "json"
 
 module Kennel
   module Tasks
@@ -75,6 +76,7 @@ namespace :kennel do
     is_push = (ENV["TRAVIS_PULL_REQUEST"] == "false" || ENV["GITHUB_EVENT_NAME"] == "push")
     task_name =
       if on_default_branch && is_push
+        Kennel.strict_imports = false
         "kennel:update_datadog"
       else
         "kennel:plan" # show plan in CI logs
@@ -89,7 +91,7 @@ namespace :kennel do
     Kennel::UnmutedAlerts.print(Kennel.send(:api), tag)
   end
 
-  desc "show monitors with no data by TAG, for example TAG=team:foo"
+  desc "show monitors with no data by TAG, for example TAG=team:foo [THRESHOLD_DAYS=7] [FORMAT=json]"
   task nodata: :environment do
     tag = ENV["TAG"] || Kennel::Tasks.abort("Call with TAG=foo:bar")
     monitors = Kennel.send(:api).list("monitor", monitor_tags: tag, group_states: "no data")
@@ -97,16 +99,45 @@ namespace :kennel do
     monitors.reject! { |m| m[:tags].include? "nodata:ignore" }
     if monitors.any?
       Kennel.err.puts <<~TEXT
-        This is a useful task to find monitors that have mis-spelled metrics or never received data at any time.
-        To ignore monitors with nodata, tag the monitor with "nodata:ignore"
+        To ignore monitors with expected nodata, tag it with "nodata:ignore"
 
       TEXT
     end
 
+    now = Time.now
     monitors.each do |m|
-      Kennel.out.puts m[:name]
-      Kennel.out.puts Kennel::Utils.path_to_url("/monitors/#{m[:id]}")
-      Kennel.out.puts
+      m[:days_in_no_data] =
+        if m[:overall_state_modified]
+          since = Date.parse(m[:overall_state_modified]).to_time
+          ((now - since) / (24 * 60 * 60)).to_i
+        else
+          999
+        end
+    end
+
+    if threshold = ENV["THRESHOLD_DAYS"]
+      monitors.select! { |m| m[:days_in_no_data] > Integer(threshold) }
+    end
+
+    monitors.each { |m| m[:url] = Kennel::Utils.path_to_url("/monitors/#{m[:id]}") }
+
+    if ENV["FORMAT"] == "json"
+      report = monitors.map do |m|
+        match = m[:message].to_s.match(/-- Managed by kennel (\S+:\S+) in (\S+), /) || []
+        m.slice(:url, :name, :tags, :days_in_no_data).merge(
+          kennel_tracking_id: match[1],
+          kennel_source: match[2]
+        )
+      end
+
+      Kennel.out.puts JSON.pretty_generate(report)
+    else
+      monitors.each do |m|
+        Kennel.out.puts m[:name]
+        Kennel.out.puts Kennel::Utils.path_to_url("/monitors/#{m[:id]}")
+        Kennel.out.puts "No data since #{m[:days_in_no_data]}d"
+        Kennel.out.puts
+      end
     end
   end
 

data/lib/kennel/version.rb

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

data/lib/kennel.rb

@@ -42,9 +42,10 @@ module Kennel
 
   @out = $stdout
   @err = $stderr
+  @strict_imports = true
 
   class << self
-    attr_accessor :out, :err
+    attr_accessor :out, :err, :strict_imports
 
     def generate
       store generated
@@ -70,7 +71,8 @@ module Kennel
           path = "generated/#{part.tracking_id.tr("/", ":").sub(":", "/")}.json"
           used << File.dirname(path) # only 1 level of sub folders, so this is safe
           used << path
-          write_file_if_necessary(path, JSON.pretty_generate(part.as_json) << "\n")
+          payload = part.as_json.merge(api_resource: part.class.api_resource)
+          write_file_if_necessary(path, JSON.pretty_generate(payload) << "\n")
         end
 
         # deleting all is slow, so only delete the extras

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.100.0
+  version: 1.103.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-06 00:00:00.000000000 Z
+date: 2021-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday