kennel 1.140.0 → 1.142.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8a15178bd108647314171a012bafa0c977f998a8488418c0d323de095e0a1b3
-  data.tar.gz: 1673aec908b72090afa31e0b3dd8a923dbf505c01ab2f5dfd6211846edab4f7d
+  metadata.gz: 4d3462f8e8c88a8faab007c9d65f799703152083c59f9b1f726eb7f958efb743
+  data.tar.gz: f24f0df2e733292cb32cedfe257cb7393b8403f35585ede6fb008fd9e7668bb4
 SHA512:
-  metadata.gz: 0343af2d0a40081a7fd8ffe5bb9932344f75ef91f1b688f4b6e4eb72a0bd5f59c9b67cf72f498bb008f76aae7f6df645b0bcd8258b5c1c892cb8cd3ef21cc468
-  data.tar.gz: 3a1f1df7f6195ec235713dc173e8c869013654355432159e1bd1e59dd29ea3d849407ee9cf43f31453411a54224ae1ea8b80bc1e01e209176d0cfe28f8fc2bc3
+  metadata.gz: 75b7f56baabbffc696d44acae8d08277afd499fd1915f1f268a7ffd9010ff9fc6f1ae59c06f54a78d1b3e49829d9ec61f0d98fd16ac00d85ef494451339fe3e2
+  data.tar.gz: a5c96201475a76c9712313cbfc1bfbd629f87748d2d8d101dc3413ebc72a5399b18291df8fab64f6162c3e534fda17f6069d12fd380fc2c5e32c635f7a8bab13

data/Readme.md

@@ -28,6 +28,7 @@ end
 class Bar < Kennel::Models::Project
   defaults(
     team: -> { Teams::Foo.new }, # use mention and tags from the team
+    tags: -> { super() + ["project:bar"] }, # unique tag for all project components
     parts: -> {
       [
         Kennel::Models::Monitor.new(

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/models/project.rb

@@ -4,7 +4,7 @@ module Kennel
     class Project < Base
       settings :team, :parts, :tags, :mention, :name, :kennel_id
       defaults(
-        tags: -> { ["service:#{kennel_id}"] + team.tags },
+        tags: -> { team.tags },
         mention: -> { team.mention }
       )
 

data/lib/kennel/models/slo.rb

@@ -92,6 +92,14 @@ module Kennel
           invalid! :tags_are_upper_case, "Tags must not be upper case (bad tags: #{bad_tags.sort.inspect})"
         end
 
+        # prevent "Invalid payload: The target is incorrect: target must be a positive number between (0.0, 100.0)"
+        data[:thresholds]&.each do |threshold|
+          target = threshold.fetch(:target)
+          if !target || target <= 0 || target >= 100
+            invalid! :threshold_target_invalid, "SLO threshold target must be > 0 and < 100"
+          end
+        end
+
         # warning must be <= critical
         if data[:thresholds].any? { |t| t[:warning] && t[:warning].to_f <= t[:critical].to_f }
           invalid! :warning_must_be_gt_critical, "Threshold warning must be greater-than critical value"

data/lib/kennel/version.rb

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

data/template/Readme.md

@@ -28,6 +28,7 @@ end
 class Bar < Kennel::Models::Project
   defaults(
     team: -> { Teams::Foo.new }, # use mention and tags from the team
+    tags: -> { super() + ["project:bar"] }, # unique tag for all project components
     parts: -> {
       [
         Kennel::Models::Monitor.new(

metadata

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