kennel 1.107.1 → 1.109.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70f6012b2bb28973367faa9bb4ba9bd97e84ea182b6ba0e3c6b0779b4cc717fc
-  data.tar.gz: 2dc559844f4116c56de8d456fb467079476b80e33ae5a03415541bfb3e749985
+  metadata.gz: ffd1a9a74e7d2ac535e24fdb6f4fef30fad6c6e61e61ae7b73b17821510c0a2e
+  data.tar.gz: 761b0cd94a3a4ec951302e9aa7b7a9d806330cfe7ba6adc0b83571b332f4eea9
 SHA512:
-  metadata.gz: 8573febe6011241b87f657e5aa205fce7684b18b3db757045d7011132fbe21c5f3538e99c51413bc2209f6a250cc359fac96fdad47c5ecaef1685b1d27f9d847
-  data.tar.gz: a9a43bcacacf819253cbd0d73611e264053b5ed665340ee0390b6e6c4e0b5a3660a469c26fe07bcfaaec2e860b7f5be00adee2e8b0591b65b5d52a2527b6b496
+  metadata.gz: db853fd8eb79eeeb29556fb132bdd03e2042e955848b4d3b466c140a06b61e61522b2656437da4488c50428da9b8e37cd3cd172a33d12b956ba98a85a71392da
+  data.tar.gz: a240420d91cfe30d250d1e7ef3462a34f7845825dd3bcbfe9eabd511ac231b882e285668c6553c0835afa710777016b7379fe143b771cf145524383191101b31

data/lib/kennel/models/base.rb

@@ -10,11 +10,7 @@ module Kennel
       SETTING_OVERRIDABLE_METHODS = [:name, :kennel_id].freeze
 
       def kennel_id
-        name = self.class.name
-        if name.start_with?("Kennel::") # core objects would always generate the same id
-          raise_with_location ArgumentError, "Set :kennel_id"
-        end
-        @kennel_id ||= Utils.snake_case name
+        @kennel_id ||= Utils.snake_case kennel_id_base
       end
 
       def name
@@ -24,6 +20,17 @@ module Kennel
       def to_json # rubocop:disable Lint/ToJSON
         raise NotImplementedError, "Use as_json"
       end
+
+      private
+
+      # hook to allow overwriting id generation to remove custom module scopes
+      def kennel_id_base
+        name = self.class.name
+        if name.start_with?("Kennel::") # core objects would always generate the same id
+          raise_with_location ArgumentError, "Set :kennel_id"
+        end
+        name
+      end
     end
   end
 end

data/lib/kennel/models/monitor.rb

@@ -111,6 +111,14 @@ module Kennel
         # 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)
 
+        # Add in statuses where we would re notify on. Possible values: alert, no data, warn
+        if options[:renotify_interval] != 0
+          statuses = ["alert"]
+          statuses << "no data" if options[:notify_no_data]
+          statuses << "warn" if options.dig(:thresholds, :warning)
+          options[:renotify_statuses] = statuses
+        end
+
         validate_json(data) if validate
 
         @as_json = data

data/lib/kennel/tasks.rb

@@ -165,7 +165,9 @@ namespace :kennel do
       end
     api = Kennel.send(:api)
     list = nil
+    first = true
 
+    Kennel.out.puts "["
     resources.each do |resource|
       Kennel::Progress.progress("Downloading #{resource}") do
         list = api.list(resource)
@@ -173,16 +175,22 @@ namespace :kennel do
       end
       list.each do |r|
         r[:api_resource] = resource
-        Kennel.out.puts JSON.pretty_generate(r)
+        if first
+          first = false
+        else
+          Kennel.out.puts ","
+        end
+        Kennel.out.print JSON.pretty_generate(r)
       end
     end
+    Kennel.out.puts "\n]"
   end
 
   desc "Find items from dump by pattern DUMP= PATTERN= [URLS=true]"
   task dump_grep: :environment do
     file = ENV.fetch("DUMP")
     pattern = Regexp.new ENV.fetch("PATTERN")
-    items = File.read(file).gsub("}\n{", "}--SPLIT--{").split("--SPLIT--")
+    items = File.read(file)[2..-2].gsub("},\n{", "}--SPLIT--{").split("--SPLIT--")
     models = Kennel::Models::Record.api_resource_map
     found = items.grep(pattern)
     exit 1 if found.empty?

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.107.1
+  version: 1.109.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-02 00:00:00.000000000 Z
+date: 2022-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday