kennel 1.106.0 → 1.108.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64e7e091960a708dfbbb90e4e11ec9a5e3d121d9e2e681d42d0b2bb544656a67
-  data.tar.gz: 42fbb64cf3bd1e210135cede6ecd5e72d808e059e441b7457d8e0bb0bfc63c4f
+  metadata.gz: 056d04f7a660ae4cafb20d7f74b653188e6f0a38d8def21770e5217baedabadd
+  data.tar.gz: a639e95f70deea5ca8f7f809bd530708e4de24448852976f30e752e425b81190
 SHA512:
-  metadata.gz: 9cbfaaf173f52cb6c6644c59a366b1c84a7214f0ae8e3e6760c92f7d07413b267bebc6ebaa6a5ddb8b8a50f64263f98463b159eebabbb1ce79c7dabbf486aeb6
-  data.tar.gz: ee657ce3feea138581fb2a19265b776ead38b5c93ecd84f7d14e454a134964f4bcec4298b37d8bfe03040848672af349cb246fcf18e3e7b9fb53fe1f343f1f42
+  metadata.gz: 2e271c571a396798036aa081535cfef3e57c9f44f5265e72baf8fe3b42225ef4f20630072923296f820d74d98a1874709512fe857b8b2d40eadea7f12f3f3876
+  data.tar.gz: b6ce5b0e39bab361310c7cc7581790ddbc008c0a0fb2e6354a45f78df5a2de5e92c1525aff4444240ec24a94b69af56a75fa11725045ba2afd00e6516ed36461

data/lib/kennel/models/monitor.rb

@@ -223,6 +223,10 @@ module Kennel
           validate_message_variables(data)
         end
 
+        if type == "service check" && !data[:query].to_s.include?(".by(")
+          invalid! "query must include a .by() at least .by(\"*\")"
+        end
+
         unless ALLOWED_PRIORITY_CLASSES.include?(priority.class)
           invalid! "priority needs to be an Integer"
         end
@@ -249,6 +253,8 @@ module Kennel
           match[1].to_s.split(/\s*,\s*/).map { |k| k.split(":", 2)[-2] } + # {a:b} -> a TODO: does not work for service check
           match[2].to_s.gsub(/["']/, "").split(/\s*,\s*/) # by {a} -> a
 
+        return if allowed.include?("*")
+
         allowed.compact!
         allowed.uniq!
         allowed.map! { |w| "#{w.tr('"', "")}.name" }

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.106.0"
+  VERSION = "1.108.0"
 end

metadata

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