kennel 1.94.2 → 1.97.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a084e0be7ff70945f9cdc705440e520d8613627d237633e4d49c83cb51222229
-  data.tar.gz: a4d1ab3746d71351a9606f3084d24fd7eff4781df659f28263ac5803744ec1dc
+  metadata.gz: 709d0b2dfc1941a144a4ea5a8089bc82778ac271c7586c0606aa01ac182656cd
+  data.tar.gz: b93a0e78bf9fc66dbb2f9b4de43fb540d39392bcc6fc5b147a7535242391c6f9
 SHA512:
-  metadata.gz: d69aad6485a1243c18880a4d257d4edf45c2c9f2cbd1c8c3935528a10e546db7f8d1922e8adef660ab79360b84c5a63891495fd487f3f889c091b5c1cffacb62
-  data.tar.gz: 94f9c351163a3e4efd6cb3a04a5c2068aa7810481203f4f8b937b6fd5e76615a96249cc99d0328c89bf3d6e247a62488bd2562801112fb6b58432ba6d2213617
+  metadata.gz: 3862967bda2b37171a989e261d793d0ea47cb324c7088ecc2f682d8ca5a043c6586220b6cfe561e3c10b5dae97852492907eef84cc77f275d628748e2bcc153c
+  data.tar.gz: c27ded1f767246a190ca5b0431b8ed03d1a94045fb57c2ce0be297d3c4aa1606246a4ef3cdcb1ff97ca6f0e4d89f8938064b1b8784ad8c6d78c63228d5f9684a

data/lib/kennel/models/dashboard.rb

@@ -69,7 +69,10 @@ module Kennel
         template_variable_presets: nil
       }.freeze
 
-      settings :title, :description, :definitions, :widgets, :layout_type, :template_variable_presets, :reflow_type
+      settings(
+        :title, :description, :definitions, :widgets, :layout_type, :template_variable_presets, :reflow_type,
+        :tags
+      )
 
       defaults(
         description: -> { "" },
@@ -77,6 +80,10 @@ 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,
         id: -> { nil }
       )
 
@@ -145,10 +152,12 @@ module Kennel
         return @json if @json
         all_widgets = render_definitions(definitions) + widgets
         expand_q all_widgets
+        tags = tags()
+        tags_as_string = (tags.empty? ? "" : " (#{tags.join(" ")})")
 
         @json = {
           layout_type: layout_type,
-          title: "#{title}#{LOCK}",
+          title: "#{title}#{tags_as_string}#{LOCK}",
           description: description,
           template_variables: render_template_variables,
           template_variable_presets: template_variable_presets,

data/lib/kennel/models/monitor.rb

@@ -19,6 +19,7 @@ module Kennel
       MONITOR_OPTION_DEFAULTS = {
         evaluation_delay: nil,
         new_host_delay: 300,
+        new_group_delay: 60,
         timeout_h: 0,
         renotify_interval: 0,
         notify_audit: false,
@@ -31,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, :priority
+        :threshold_windows, :new_host_delay, :new_group_delay, :priority
       )
 
       defaults(
@@ -45,6 +46,7 @@ module Kennel
         no_data_timeframe: -> { 60 },
         notify_audit: -> { MONITOR_OPTION_DEFAULTS.fetch(:notify_audit) },
         new_host_delay: -> { MONITOR_OPTION_DEFAULTS.fetch(:new_host_delay) },
+        new_group_delay: -> { MONITOR_OPTION_DEFAULTS.fetch(:new_group_delay) },
         tags: -> { @project.tags },
         timeout_h: -> { MONITOR_OPTION_DEFAULTS.fetch(:timeout_h) },
         evaluation_delay: -> { MONITOR_OPTION_DEFAULTS.fetch(:evaluation_delay) },
@@ -70,6 +72,7 @@ module Kennel
             notify_audit: notify_audit,
             require_full_window: require_full_window,
             new_host_delay: new_host_delay,
+            new_group_delay: new_group_delay,
             include_tags: true,
             escalation_message: Utils.presence(escalation_message.strip),
             evaluation_delay: evaluation_delay,

data/lib/kennel/models/team.rb

@@ -2,10 +2,11 @@
 module Kennel
   module Models
     class Team < Base
-      settings :mention, :tags, :renotify_interval, :kennel_id
+      settings :mention, :tags, :renotify_interval, :kennel_id, :tag_dashboards
       defaults(
         tags: -> { ["team:#{kennel_id.sub(/^teams_/, "")}"] },
-        renotify_interval: -> { 0 }
+        renotify_interval: -> { 0 },
+        tag_dashboards: -> { false }
       )
     end
   end

data/lib/kennel/version.rb

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

data/lib/kennel.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require "faraday"
 require "json"
+require "zeitwerk"
 require "shellwords"
 require "English"
 
@@ -30,6 +31,10 @@ require "kennel/models/synthetic_test"
 require "kennel/models/project"
 require "kennel/models/team"
 
+# need to define early since we autoload the teams/ folder into it
+module Teams
+end
+
 module Kennel
   class ValidationError < RuntimeError
   end
@@ -128,9 +133,34 @@ module Kennel
     end
 
     def load_all
-      ["teams", "parts", "projects"].each do |folder|
+      loader = Zeitwerk::Loader.new
+      Dir.exist?("teams") && loader.push_dir("teams", namespace: Teams)
+      Dir.exist?("parts") && loader.push_dir("parts")
+      loader.setup
+
+      # TODO: also do projects and update expected path too
+      ["projects"].each do |folder|
         Dir["#{folder}/**/*.rb"].sort.each { |f| require "./#{f}" }
       end
+    rescue NameError => e
+      message = e.message
+      raise unless klass = message[/uninitialized constant (.*)/, 1]
+
+      # inverse of zeitwerk lib/zeitwerk/inflector.rb
+      path = klass.gsub("::", "/").gsub(/([a-z])([A-Z])/, "\\1_\\2").downcase + ".rb"
+      expected_path = (path.start_with?("teams/") ? path : "parts/#{path}")
+
+      # TODO: prefer to raise a new exception with the old backtrace attacked
+      e.define_singleton_method(:message) do
+        "\n" + <<~MSG.gsub(/^/, "  ")
+          #{message}
+          Unable to load #{klass} from #{expected_path}
+          - Option 1: rename the constant or the file it lives in, to make them match
+          - Option 2: Use `require` or `require_relative` to load the constant
+        MSG
+      end
+
+      raise
     end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.94.2
+  version: 1.97.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-16 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 description: 
 email: michael@grosser.it
 executables: []