kennel 1.134.0 → 1.135.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29607b30d85bba2fd2fb0b07167ac0b303f11cdad69e44a49b7c9be51beea993
-  data.tar.gz: fbd4a93bba2180ccc96d4d0e14102e1c0abd1c9c8746173d741a1fd1e9304c50
+  metadata.gz: 24069caa804f546ea584129a0c300e0ceb974798a3015a7c70a9a0f0b2423da6
+  data.tar.gz: 9fb59fc2d21a839ebd965f5f72b604c75d1bac64e1591cd51614c1ec0f24d947
 SHA512:
-  metadata.gz: 9de698bc96083153ca975c90b92bf0b1a3e6473ef68ea6c4ef12fb715e5430034707bcfa14d076669e83fd7f662c688b1ba061fa7a98dd5d7c29a2c0a12a889b
-  data.tar.gz: 75038e974bc2a27788499ca58039437f8f0c15685e22890827c5ae572cc8a7645bc9aac5a634be2302b65ec23291632c2b0caf39cf23b20cc4d747aeea040e0a
+  metadata.gz: b566afcb3f60379a20cce4bcdea77238ec4dcbfc243ce6c1c0c5017710e4037591a55fca1c4dd7963539fa919710cff422d19beb1cc05414572266c7b9a7be1f
+  data.tar.gz: 717abf8426124a8be7d9f36ece88226adf56a3543673f0260a7295d5884748e91269fb0a75babd91ba05d4f8928cf1fe8e8255b95f54919039775f65cd1f601c

data/lib/kennel/models/dashboard.rb

@@ -72,6 +72,8 @@ module Kennel
         template_variable_presets: nil
       }.freeze
 
+      TAG_PREFIX = /^team:/
+
       settings(
         :title, :description, :definitions, :widgets, :layout_type, :template_variable_presets, :reflow_type,
         :tags
@@ -83,10 +85,7 @@ module Kennel
         widgets: -> { [] },
         template_variable_presets: -> { DEFAULTS.fetch(:template_variable_presets) },
         reflow_type: -> { layout_type == "ordered" ? "auto" : nil },
-        tags: -> do # not inherited by default to make onboarding to using dashboard tags simple
-          team = project.team
-          team.tag_dashboards ? team.tags : []
-        end
+        tags: -> { project.team.tags } # ideally project.tags but that causes diffs
       )
 
       class << self
@@ -154,7 +153,9 @@ module Kennel
         all_widgets = render_definitions(definitions) + widgets
         expand_q all_widgets
         tags = tags()
-        tags_as_string = (tags.empty? ? "" : " (#{tags.join(" ")})")
+
+        # TODO: remove this once dd UI shows all tags ... maybe remove team tag once that is usable vis UI
+        tags_as_string = (project.team.tag_dashboards && !tags.empty? ? " (#{tags.join(" ")})" : "")
 
         json = super.merge(
           layout_type: layout_type,
@@ -162,7 +163,8 @@ module Kennel
           description: description,
           template_variables: render_template_variables,
           template_variable_presets: template_variable_presets,
-          widgets: all_widgets
+          widgets: all_widgets,
+          tags: tags.grep(TAG_PREFIX)
         )
 
         json[:reflow_type] = reflow_type if reflow_type # setting nil breaks create with "ordered"

data/lib/kennel/models/monitor.rb

@@ -32,7 +32,7 @@ module Kennel
       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, :validate_using_links, :variables, :on_missing_data
+        :threshold_windows, :scheduling_options, :new_host_delay, :new_group_delay, :priority, :validate_using_links, :variables, :on_missing_data
       )
 
       defaults(
@@ -52,6 +52,7 @@ module Kennel
         critical_recovery: -> { nil },
         warning_recovery: -> { nil },
         threshold_windows: -> { nil },
+        scheduling_options: -> { nil },
         priority: -> { MONITOR_DEFAULTS.fetch(:priority) },
         variables: -> { MONITOR_OPTION_DEFAULTS.fetch(:variables) },
         on_missing_data: -> { MONITOR_OPTION_DEFAULTS.fetch(:on_missing_data) }
@@ -114,6 +115,10 @@ module Kennel
           options[:threshold_windows] = windows
         end
 
+        if schedule = scheduling_options
+          options[:scheduling_options] = schedule
+        end
+
         # 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)
 

data/lib/kennel/models/record.rb

@@ -151,7 +151,7 @@ module Kennel
         rescue StandardError
           if unfiltered_validation_errors.empty?
             @unfiltered_validation_errors = nil
-            raise PrepareError, safe_tracking_id
+            raise PrepareError, safe_tracking_id # FIXME: this makes errors hard to debug when running tests
           end
         end
 

data/lib/kennel/tasks.rb

@@ -111,6 +111,8 @@ namespace :kennel do
 
   desc "update datadog (scope with PROJECT=name)"
   task update_datadog: :environment do
+    Kennel::Tasks.kennel.preload
+    Kennel::Tasks.kennel.generate
     Kennel::Tasks.kennel.update
   end
 

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.134.0
+  version: 1.135.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-16 00:00:00.000000000 Z
+date: 2023-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs