kennel 1.119.0 → 1.121.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67b43081a187354fb146269d929da674d533263b44b3f2cee00b2baa7cc8bc57
-  data.tar.gz: c14b369716513a92791496a92c29c7648499d0a06f05e34d36c628f4a9bb9305
+  metadata.gz: bb8230c7d3bd7abc24f4c0a1b18de96b7ef892d2f54bdc2ccc010d9ba10a80c6
+  data.tar.gz: b2793e6ac6a79cdb809f77f749b5210501e48bfefb5baa38c2f16ed7043c75ed
 SHA512:
-  metadata.gz: b0eb58d97d4be73227f791379f623a188ab45256749cd4b11a969444a8598d8b30f70490c12dbad12ff0a46d42f2ff1820998304b7167cc11a9876e8aaef06cc
-  data.tar.gz: cb38270a791164a92a06522921234838fe4e944e54ebd53a54c00939d531861847de0d4b6cef8d3605a9b2692874e9ac5715ce4fa4df07550f26094e810be845
+  metadata.gz: 24d20844e2b74bee9f13c2daf5a80d4a366e7251b826b61e1dd4d5172918cf5fc5b5d694bc7604c7f64d3543150a2f1a8d1884c5c6f462e48b52b74a51267c5f
+  data.tar.gz: 1c52708d519c711b55aa62cb9016ec7124b52634526343ee4140422223e90da351aadd466238bff5e07031dac8b14312cafecde3917e7308193d2c3af9119aeb

data/lib/kennel/filter.rb

@@ -2,35 +2,48 @@
 
 module Kennel
   class Filter
+    attr_reader :project_filter, :tracking_id_filter
+
     def initialize
-      project_filter
-      tracking_id_filter
+      # build early so we fail fast on invalid user input
+      @tracking_id_filter = build_tracking_id_filter
+      @project_filter = build_project_filter
+    end
+
+    def filter_projects(projects)
+      filter_resources(projects, :kennel_id, project_filter, "projects", "PROJECT")
     end
 
-    def project_filter
-      projects = ENV["PROJECT"]&.split(",")&.sort&.uniq
-      tracking_projects = tracking_id_filter&.map { |id| id.split(":", 2).first }&.sort&.uniq
-      if projects && tracking_projects && projects != tracking_projects
+    def filter_parts(parts)
+      filter_resources(parts, :tracking_id, tracking_id_filter, "resources", "TRACKING_ID")
+    end
+
+    private
+
+    def build_project_filter
+      project_names = ENV["PROJECT"]&.split(",")&.sort&.uniq
+      tracking_project_names = tracking_id_filter&.map { |id| id.split(":", 2).first }&.sort&.uniq
+      if project_names && tracking_project_names && project_names != tracking_project_names
         raise "do not set PROJECT= when using TRACKING_ID="
       end
-      (projects || tracking_projects)
+      (project_names || tracking_project_names)
     end
 
-    def tracking_id_filter
+    def build_tracking_id_filter
       (tracking_id = ENV["TRACKING_ID"]) && tracking_id.split(",").sort.uniq
     end
 
-    def self.filter_resources!(resources, by, against, name, env)
-      return unless against
+    def filter_resources(resources, by, expected, name, env)
+      return resources unless expected
 
-      against = against.uniq
+      expected = expected.uniq
       before = resources.dup
-      resources.select! { |p| against.include?(p.send(by)) }
+      resources = resources.select { |p| expected.include?(p.send(by)) }
       keeping = resources.uniq(&by).size
-      return if keeping == against.size
+      return resources if keeping == expected.size
 
       raise <<~MSG.rstrip
-        #{env}=#{against.join(",")} matched #{keeping} #{name}, try any of these:
+        #{env}=#{expected.join(",")} matched #{keeping} #{name}, try any of these:
         #{before.map(&by).sort.uniq.join("\n")}
       MSG
     end

data/lib/kennel/models/monitor.rb

@@ -27,11 +27,12 @@ module Kennel
       }.freeze
       DEFAULT_ESCALATION_MESSAGE = ["", nil].freeze
       ALLOWED_PRIORITY_CLASSES = [NilClass, Integer].freeze
+      ALLOWED_UNLINKED = [] # rubocop:disable Style/MutableConstant placeholder for custom overrides
 
       settings(
         :query, :name, :message, :escalation_message, :critical, :type, :renotify_interval, :warning, :timeout_h, :evaluation_delay,
         :ok, :no_data_timeframe, :notify_no_data, :notify_audit, :tags, :critical_recovery, :warning_recovery, :require_full_window,
-        :threshold_windows, :new_host_delay, :new_group_delay, :priority
+        :threshold_windows, :new_host_delay, :new_group_delay, :priority, :validate_using_links
       )
 
       defaults(
@@ -238,6 +239,8 @@ module Kennel
           validate_message_variables(data)
         end
 
+        validate_using_links(data)
+
         if type == "service check" && !data[:query].to_s.include?(".by(")
           invalid! "query must include a .by() at least .by(\"*\")"
         end
@@ -261,6 +264,7 @@ module Kennel
         return if used.empty?
         used.flatten!(1)
         used.uniq!
+        used.map! { |w| w.tr("[]", "") }
 
         # TODO
         # - also match without by
@@ -286,6 +290,21 @@ module Kennel
           Group or filter the query by #{forbidden.map { |f| f.sub(".name", "") }.join(", ")} to use it.
         MSG
       end
+
+      def validate_using_links(data)
+        case data[:type]
+        when "composite" # TODO: add slo to mirror resolve_linked_tracking_ids! logic
+          ids = data[:query].tr("-", "_").scan(/\b\d+\b/)
+          ids.reject! { |id| ALLOWED_UNLINKED.include?([tracking_id, id]) }
+          if ids.any?
+            invalid! <<~MSG.rstrip
+              Used #{ids} in the query, but should only use links in the form of %{<project id>:<monitor id>}
+              If that is not possible, add `validate_using_links: ->(*){} # linked monitors are not in kennel
+            MSG
+          end
+        else # do nothing
+        end
+      end
     end
   end
 end

data/lib/kennel/version.rb

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

data/lib/kennel.rb

@@ -101,10 +101,10 @@ module Kennel
       @generated ||= begin
         Progress.progress "Generating" do
           projects = projects_provider.projects
-          Kennel::Filter.filter_resources!(projects, :kennel_id, filter.project_filter, "projects", "PROJECT")
+          projects = filter.filter_projects projects
 
           parts = Utils.parallel(projects, &:validated_parts).flatten(1)
-          Kennel::Filter.filter_resources!(parts, :tracking_id, filter.tracking_id_filter, "resources", "TRACKING_ID")
+          parts = filter.filter_parts parts
 
           parts.group_by(&:tracking_id).each do |tracking_id, same|
             next if same.size == 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.119.0
+  version: 1.121.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-29 00:00:00.000000000 Z
+date: 2022-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs