kennel 1.30.0 → 1.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55d07417188bb69c72a8f7129b3ce9f511dd65194e2205abf72f5b0b83f10f84
-  data.tar.gz: c45f228ccccd085fd93083c6cad65d6f6695c9f7ec4193ce14055fa05746c88d
+  metadata.gz: 82e31f58b23229f5a5408eb59cf577f2ce23956dc5083a3e389bc35a3294a422
+  data.tar.gz: 8f5d346672553ad42bec0f19dd23bc2a39032f845d3e930d77698385c4abf8a7
 SHA512:
-  metadata.gz: f516120e702ea779bd61ed025fafbb5bcb22282f35ed4cc837622c73c5abe4e72ede39cf0a10cf536000a4d333be5cd6620f6fc47392c061c1f5ca61d27c8094
-  data.tar.gz: 4480905ca7260a493ba626555a388299ca4f490b2078f936316443cc57a3e673a45792aa3108cf0bac8490f4239a10f625090d0bea22be9ef75bb00a5a5e92e8
+  metadata.gz: ab0964256569162a0aaac2c3b6c65c289b85a4815c307134eec882aaf4b2251686b880572d8c72e2516616df88ce53b91945d1f14940cab1e44c9b2a7c7f23e7
+  data.tar.gz: 7c19c8896b1cdac2ee8dc3830af85cbc36e355ebcd1ac4df262ab20396644662b0bfc0204a2953776f174b7d19ef3ec7bb757abb9dba21e700e8fb2d8f38f2ec

data/lib/kennel/importer.rb

@@ -2,7 +2,8 @@
 
 module Kennel
   class Importer
-    SORT_ORDER = [:title, :name, :board_title, :id, :kennel_id, :query, :message, :description, :template_variables].freeze
+    TITLES = [:name, :title, :board_title].freeze
+    SORT_ORDER = [*TITLES, :id, :kennel_id, :type, :tags, :query, :message, :description, :template_variables].freeze
 
     def initialize(api)
       @api = api
@@ -21,19 +22,27 @@ module Kennel
       id = data.fetch(:id) # store numerical id returned from the api
       model.normalize({}, data)
       data[:id] = id
-      data[:kennel_id] = "pick_something_descriptive"
+      data[:kennel_id] = Kennel::Utils.parameterize(data.fetch(TITLES.detect { |t| data[t] }))
 
-      # flatten monitor options so they are all on the base
       if resource == "monitor"
+        # flatten monitor options so they are all on the base
         data.merge!(data.delete(:options))
         data.merge!(data.delete(:thresholds) || {})
         data = data.slice(*model.instance_methods)
+
+        # make query use critical method if it matches
+        critical = data[:critical]
+        query = data[:query]
+        if query && critical
+          query.sub!(/([><=]) (#{Regexp.escape(critical.to_f.to_s)}|#{Regexp.escape(critical.to_i.to_s)})$/, "\\1 \#{critical}")
+        end
       end
 
+      pretty = pretty_print(data).lstrip.gsub("\\#", "#")
       <<~RUBY
         #{model.name}.new(
           self,
-          #{pretty_print(data).lstrip}
+          #{pretty}
         )
       RUBY
     end
@@ -43,20 +52,23 @@ module Kennel
     def pretty_print(hash)
       list = hash.sort_by { |k, _| [SORT_ORDER.index(k) || 999, k] } # important to the front and rest deterministic
       list.map do |k, v|
-        case v
-        when Hash, Array
-          # update answer here when changing https://stackoverflow.com/questions/8842546/best-way-to-pretty-print-a-hash
-          # (exclude indent line)
-          pretty = JSON.pretty_generate(v)
-            .gsub(": null", ": nil")
-            .gsub(/(^\s*)"([a-zA-Z][a-zA-Z\d_]*)":/, "\\1\\2:") # "foo": 1 -> foo: 1
-            .gsub(/(^\s*)(".*?"):/, "\\1\\2 =>") # "123": 1 -> "123" => 1
-            .gsub(/^/, "    ") # indent
-
-          "  #{k}: -> {\n#{pretty}\n  }"
-        else
-          "  #{k}: -> { #{v.inspect} }"
-        end
+        pretty_value =
+          if v.is_a?(Hash) || (v.is_a?(Array) && !v.all? { |e| e.is_a?(String) })
+            # update answer here when changing https://stackoverflow.com/questions/8842546/best-way-to-pretty-print-a-hash
+            # (exclude last indent gsub)
+            pretty = JSON.pretty_generate(v)
+              .gsub(": null", ": nil")
+              .gsub(/(^\s*)"([a-zA-Z][a-zA-Z\d_]*)":/, "\\1\\2:") # "foo": 1 -> foo: 1
+              .gsub(/(^\s*)(".*?"):/, "\\1\\2 =>") # "123": 1 -> "123" => 1
+              .gsub(/^/, "    ") # indent
+
+            "\n#{pretty}\n  "
+          elsif k == :message
+            "\n    <<~TEXT\n#{v.each_line.map { |l| l.strip.empty? ? "\n" : "      #{l}" }.join}\n    TEXT\n  "
+          else
+            " #{v.inspect} "
+          end
+        "  #{k}: -> {#{pretty_value}}"
       end.join(",\n")
     end
   end

data/lib/kennel/models/monitor.rb

@@ -9,30 +9,35 @@ module Kennel
       QUERY_INTERVALS = ["1m", "5m", "10m", "15m", "30m", "1h", "2h", "4h", "1d"].freeze
       OPTIONAL_SERVICE_CHECK_THRESHOLDS = [:ok, :warning].freeze
       READONLY_ATTRIBUTES = Base::READONLY_ATTRIBUTES + [:multi]
-      MONITOR_DEFAULTS = {
-        escalation_message: nil,
+      MONITOR_OPTION_DEFAULTS = {
         evaluation_delay: nil,
-        no_data_timeframe: nil
+        timeout_h: 0,
+        renotify_interval: 120,
+        notify_audit: true,
+        notify_no_data: true,
+        no_data_timeframe: nil # this works out ok since if notify_no_data is on, it would never be nil
       }.freeze
+      DEFAULT_ESCALATION_MESAGE = ["", nil].freeze
 
       settings(
         :query, :name, :message, :escalation_message, :critical, :kennel_id, :type, :renotify_interval, :warning, :timeout_h, :evaluation_delay,
         :ok, :id, :no_data_timeframe, :notify_no_data, :notify_audit, :tags, :critical_recovery, :warning_recovery, :require_full_window,
         :threshold_windows
       )
+
       defaults(
         message: -> { "\n\n@slack-#{project.slack}" },
-        escalation_message: -> { "" },
-        renotify_interval: -> { 120 },
+        escalation_message: -> { DEFAULT_ESCALATION_MESAGE.first },
+        renotify_interval: -> { MONITOR_OPTION_DEFAULTS.fetch(:renotify_interval) },
         warning: -> { nil },
         ok: ->  { nil },
         id: ->  { nil },
-        notify_no_data: -> { true },
+        notify_no_data: -> { MONITOR_OPTION_DEFAULTS.fetch(:notify_no_data) },
         no_data_timeframe: -> { notify_no_data ? 60 : nil },
-        notify_audit: -> { true },
+        notify_audit: -> { MONITOR_OPTION_DEFAULTS.fetch(:notify_audit) },
         tags: -> { @project.tags },
-        timeout_h: -> { 0 },
-        evaluation_delay: -> { nil },
+        timeout_h: -> { MONITOR_OPTION_DEFAULTS.fetch(:timeout_h) },
+        evaluation_delay: -> { MONITOR_OPTION_DEFAULTS.fetch(:evaluation_delay) },
         critical_recovery: -> { nil },
         warning_recovery: -> { nil },
         threshold_windows: -> { nil }
@@ -113,7 +118,6 @@ module Kennel
         super
         options = actual.fetch(:options)
         options.delete(:silenced) # we do not manage silenced, so ignore it when diffing
-        options[:escalation_message] ||= nil # unset field is not returned and would break the diff
 
         # fields are not returned when set to true
         if ["service check", "event alert"].include?(actual[:type])
@@ -136,7 +140,12 @@ module Kennel
         # nil / "" / 0 are not returned from the api when set via the UI
         options[:evaluation_delay] ||= nil
 
-        ignore_default(expected[:options] || {}, options, MONITOR_DEFAULTS)
+        expected_options = expected[:options] || {}
+        ignore_default(expected_options, options, MONITOR_OPTION_DEFAULTS)
+        if DEFAULT_ESCALATION_MESAGE.include?(options[:escalation_message])
+          options.delete(:escalation_message)
+          expected_options.delete(:escalation_message)
+        end
       end
 
       private

data/lib/kennel/syncer.rb

@@ -208,6 +208,7 @@ module Kennel
     def add_tracking_id(e)
       json = e.as_json
       field = tracking_field(json)
+      raise "remove \"-- Managed by kennel\" line it from #{field} to copy a resource" if tracking_value(json[field])
       json[field] = "#{json[field]}\n-- Managed by kennel #{e.tracking_id} in #{e.project.class.file_location}, do not modify manually".lstrip
     end
 

data/lib/kennel/utils.rb

@@ -15,12 +15,22 @@ module Kennel
 
     class << self
       def snake_case(string)
-        string.gsub(/::/, "_") # Foo::Bar -> foo_bar
+        string
+          .gsub(/::/, "_") # Foo::Bar -> foo_bar
           .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2') # FOOBar -> foo_bar
           .gsub(/([a-z\d])([A-Z])/, '\1_\2') # fooBar -> foo_bar
           .downcase
       end
 
+      # simplified version of https://apidock.com/rails/ActiveSupport/Inflector/parameterize
+      def parameterize(string)
+        string
+          .downcase
+          .gsub(/[^a-z0-9\-_]+/, "-") # remove unsupported
+          .gsub(/-{2,}/, "-") # remove duplicates
+          .gsub(/^-|-$/, "") # remove leading/trailing
+      end
+
       def presence(value)
         value.nil? || value.empty? ? nil : value
       end

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.30.0
+  version: 1.31.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2019-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday