kennel 1.140.0 → 1.141.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8a15178bd108647314171a012bafa0c977f998a8488418c0d323de095e0a1b3
-  data.tar.gz: 1673aec908b72090afa31e0b3dd8a923dbf505c01ab2f5dfd6211846edab4f7d
+  metadata.gz: e82dacccbb0c14e8b8bedd9545b782b7405ca057a02724e89aa03f0a624fa3e4
+  data.tar.gz: f70302b436c823c6cbcb765edbd56da1103b83fadf398c2c904372a8f73b36a7
 SHA512:
-  metadata.gz: 0343af2d0a40081a7fd8ffe5bb9932344f75ef91f1b688f4b6e4eb72a0bd5f59c9b67cf72f498bb008f76aae7f6df645b0bcd8258b5c1c892cb8cd3ef21cc468
-  data.tar.gz: 3a1f1df7f6195ec235713dc173e8c869013654355432159e1bd1e59dd29ea3d849407ee9cf43f31453411a54224ae1ea8b80bc1e01e209176d0cfe28f8fc2bc3
+  metadata.gz: c34733bc887129a6bda1ebc96898ca46cec0346bb008af8020d4159d23db515de54d8db8813749ba7883c0417b0cecb243a530789a4a99d6aa146679996007aa
+  data.tar.gz: a7821e5e67899aa71a068bfabbd895f7c69a369a187b7245510fc969a69d4354bad352cfb953f64293140c6282fa21d38f0e8695ab60d9186a19b30faeddd019

data/lib/kennel/models/monitor.rb

@@ -30,12 +30,11 @@ 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, :scheduling_options, :new_host_delay, :new_group_delay, :priority, :validate_using_links, :variables, :on_missing_data,
+        :threshold_windows, :scheduling_options, :new_host_delay, :new_group_delay, :priority, :variables, :on_missing_data,
         :notification_preset_name
       )
 
@@ -265,6 +264,7 @@ module Kennel
         end
 
         validate_using_links(data)
+        validate_thresholds(data)
 
         if type == "service check" && !data[:query].to_s.include?(".by(")
           invalid! :query_must_include_by, "query must include a .by() at least .by(\"*\")"
@@ -320,16 +320,45 @@ module Kennel
         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! :links_must_be_via_tracking_id, <<~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
+              Use kennel ids in the query for linking monitors instead of #{ids}, for example `%{#{project.kennel_id}:<monitor id>}`
+              If the target monitors are not managed via kennel, add `ignored_errors: [:links_must_be_via_tracking_id] # linked monitors are not in kennel`
+            MSG
+          end
+        when "slo alert"
+          if (id = data[:query][/error_budget\("([a-f\d]+)"\)/, 1])
+            invalid! :links_must_be_via_tracking_id, <<~MSG
+              Use kennel ids in the query for linking alerts to slos instead of "#{id}", for example `error_budget("%{#{project.kennel_id}:slo_id_goes_here}")
+              If the target slo is not managed by kennel, then add `ignored_errors: [:links_must_be_via_tracking_id] # linked slo is not in kennel`
             MSG
           end
         else # do nothing
         end
       end
+
+      # Prevent "Warning threshold (50.0) must be less than the alert threshold (20.0) with > comparison."
+      def validate_thresholds(data)
+        return unless (warning = data.dig(:options, :thresholds, :warning))
+        critical = data.dig(:options, :thresholds, :critical)
+
+        case data[:query]
+        when /<=?\s*\S+\s*$/
+          if warning <= critical
+            invalid!(
+              :alert_less_than_warning,
+              "Warning threshold (#{warning}) must be greater than the alert threshold (#{critical}) with < comparison"
+            )
+          end
+        when />=?\s*\S+\s*$/
+          if warning >= critical
+            invalid!(
+              :alert_less_than_warning,
+              "Warning threshold (#{warning}) must be less than the alert threshold (#{critical}) with > comparison"
+            )
+          end
+        end
+      end
     end
   end
 end

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.140.0
+  version: 1.141.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-30 00:00:00.000000000 Z
+date: 2023-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs