govuk_app_config 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 209a3832e7995ecd4fae908416ca9656849489c3b2dd9f287c175029d3c2a683
-  data.tar.gz: 5c12231bddd44f7fff7dd32c6b21484bc1ff7fef9bb3b7d54bf3abcf266bb46b
+  metadata.gz: 9f7f43376f22e323fe01a108e034bcb673fadd805c5d76971d0f2c291e862206
+  data.tar.gz: 45af98d19295bffce0940c8d2b62ffb4e1fb2d3664f56fb7679ab50ab9be3ad3
 SHA512:
-  metadata.gz: 820ef2c5342d0fc44d64d756bef5732789e65fefb0053b45ca961af214b523401348c2887cf46c93b43734a414b2a276eeb8916c79e85e1143e54dafd2710a61
-  data.tar.gz: 6fc2796951741d81cbe57712cd4de98d77976e046cecfbd68096b5f7726dbcadf1a6817f5afd557c6d80bee9f8cdaa6e4ad93aa7a628cb17b58a4414065b3877
+  metadata.gz: 1fafd81168467849be5652cf90707bf081b4276a44017d5ea696a855915946998d9d01b5e50b908d48c44f169880fb1c0a44c42821cdab61b06300543bb5c340
+  data.tar.gz: 2110d081b64ccda1902656854d6817821e8d65d93e88fde3437b48efec171486ec0faae091a673aca52d75974f60b4508c32e7e9626f91575028ba5a3ff645c5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.7.0
+
+* Add various convenience health check classes which make it easier to add
+  custom checks into apps without writing lots of code.
+
 # 1.6.0
 
 * Make health checks classes rather than instances, allowing internal data to

data/README.md

@@ -105,54 +105,10 @@ GovukStatsd.gauge "bork", 100
 GovukStatsd.time("account.activate") { @account.activate! }
 ```
 
-## Healthchecks
+## Health Checks
 
-Set up a route in your rack-compatible Ruby application, and pick the built-in
-or custom checks you wish to perform.
-
-Custom checks must be a class which implements
-[this interface](spec/lib/govuk_healthcheck/shared_interface.rb):
-
-```ruby
-class CustomCheck
-  def name
-    :custom_check
-  end
-
-  def status
-    ThingChecker.everything_okay? ? OK : CRITICAL
-  end
-
-  # Optional
-  def message
-    "This is an optional custom message"
-  end
-
-  # Optional
-  def details
-    {
-      extra: "This is an optional details hash",
-    }
-  end
-end
-```
-
-For Rails apps:
-```ruby
-get "/healthcheck", to: GovukHealthcheck.rack_response(
-  GovukHealthcheck::SidekiqRedis,
-  GovukHealthcheck::ActiveRecord,
-  CustomCheck,
-)
-```
-
-This will check:
-- Redis connectivity (via Sidekiq)
-- Database connectivity (via ActiveRecord)
-- Your custom healthcheck
-
-Each check class gets instanced each time the health check end point is called.
-This allows you to cache any complex queries speeding up performance.
+This Gem provides a common "health check" framework for apps. See [the health
+check docs](docs/healthchecks.md) for more information on how to use it.
 
 ## Rails logging
 

data/docs/healthchecks.md

@@ -0,0 +1,156 @@
+# Health Checks
+
+## Check interface
+
+A check is expected to be a class with the following methods:
+
+```ruby
+class CustomCheck
+  def name
+    :the_name_of_the_check
+  end
+
+  def status
+    if critical_condition?
+      :critical
+    elsif warning_condition?
+      :warning
+    else
+      :ok
+    end
+  end
+
+  # Optional
+  def message
+    "This is an optional custom message"
+  end
+
+  # Optional
+  def details
+    {
+      extra: "This is an optional details hash",
+    }
+  end
+
+  # Optional
+  def enabled?
+    true # false if the check is not relevant at this time
+  end
+end
+```
+
+It is expected that these methods may cache their results for performance
+reasons, if a user wants to ensure they have the latest value they should
+create a new instance of the check first.
+
+## Including checks in your app
+
+Set up a route in your rack-compatible Ruby application, and pick the built-in
+or custom checks you wish to perform.
+
+For Rails apps:
+
+```ruby
+get "/healthcheck", to: GovukHealthcheck.rack_response(
+  GovukHealthcheck::SidekiqRedis,
+  GovukHealthcheck::ActiveRecord,
+  CustomCheck,
+)
+```
+
+## Built-in Checks
+
+A convention used when naming these classes is that it should end with `Check`
+if it must be subclassed to work, but a concrete class which works on its own
+doesn't need that suffix. You should aim to follow this convention in your own
+apps, ideally putting custom health checks into a `Healthcheck` module.
+
+### `SidekiqRedis`
+
+This checks that the app has a connection to Redis via Sidekiq.
+
+### `ActiveRecord`
+
+This checks that the app has a connection to the database via ActiveRecord.
+
+### `ThresholdCheck`
+
+This class is the basis for a check which compares a value with a warning or a
+critical threshold.
+
+```ruby
+class MyThresholdCheck < GovukHealthcheck::ThresholdCheck
+  def name
+    :my_threshold_check
+  end
+
+  def value
+    # get the value to be checked
+  end
+
+  def total
+    # (optional) get the total value to be included in the details as extra
+    # information
+  end
+
+  def warning_threshold
+    # if the value is above this threshold, its status is warning
+  end
+
+  def critical_threshold
+    # if the value is above this threshold, its status is critical
+  end
+end
+```
+
+### `SidekiqQueueLatencyCheck`
+
+This class is the basis for a check which compares the Sidekiq queue latencies
+with warning or critical thresholds.
+
+```ruby
+class MySidekiqQueueLatencyCheck < GovukHealthcheck::SidekiqQueueLatencyCheck
+  def warning_threshold(queue:)
+    # the warning threshold for a particular queue
+  end
+
+  def critical_threshold(queue:)
+    # the critical threshold for a particular queue
+  end
+end
+```
+
+### `SidekiqQueueSizeCheck`
+
+This class is the basis for a check which compares the Sidekiq queue sizes
+with warning or critical thresholds.
+
+```ruby
+class MySidekiqQueueSizeCheck < GovukHealthcheck::SidekiqQueueSizeCheck
+  def warning_threshold(queue:)
+    # the warning threshold for a particular queue
+  end
+
+  def critical_threshold(queue:)
+    # the critical threshold for a particular queue
+  end
+end
+```
+
+
+### `SidekiqRetrySizeCheck`
+
+Similar to `SidekiqQueueSizeCheck`, this class is the basis for a check which
+compares the Sidekiq retry set size with a warning and critical threshold.
+
+```ruby
+class MySidekiqRetrySizeCheck < GovukHealthcheck::SidekiqRetrySizeCheck
+  def warning_threshold
+    # the warning threshold for the retry set
+  end
+
+  def critical_threshold
+    # the critical threshold for the retry set
+  end
+end
+```

data/govuk_app_config.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.6.0"
+  spec.add_development_dependency "rspec-its", "~> 1.2.0"
   spec.add_development_dependency "climate_control"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "pry"

data/lib/govuk_app_config/govuk_healthcheck/checkup.rb

@@ -43,9 +43,13 @@ module GovukHealthcheck
     end
 
     def build_component_status(check)
-      component_status = details(check).merge(status: check.status)
-      component_status[:message] = check.message if check.respond_to?(:message)
-      component_status
+      if check.respond_to?(:enabled?) && !check.enabled?
+        { status: :ok, message: "currently disabled" }
+      else
+        component_status = details(check).merge(status: check.status)
+        component_status[:message] = check.message if check.respond_to?(:message)
+        component_status
+      end
     end
 
     def details(check)

data/lib/govuk_app_config/govuk_healthcheck/sidekiq_queue_check.rb

@@ -0,0 +1,62 @@
+module GovukHealthcheck
+  class SidekiqQueueCheck
+    def status
+      queues.each do |name, value|
+        if value >= critical_threshold(queue: name)
+          return :critical
+        elsif value >= warning_threshold(queue: name)
+          return :warning
+        end
+      end
+
+      :ok
+    end
+
+    def message
+      messages = queues.map do |name, value|
+        critical = critical_threshold(queue: name)
+        warning = warning_threshold(queue: name)
+
+        if value >= critical
+          "#{name} (#{value}) is above the critical threshold (#{critical})"
+        elsif value >= warning
+          "#{name} (#{value}) is above the warning threshold (#{warning})"
+        end
+      end
+
+      messages = messages.compact
+
+      if messages.empty?
+        "all queues are below the critical and warning thresholds"
+      else
+        messages.join("\n")
+      end
+    end
+
+    def details
+      {
+        queues: queues.each_with_object({}) do |(name, value), hash|
+          hash[name] = {
+            value: value,
+            thresholds: {
+              critical: critical_threshold(queue: name),
+              warning: warning_threshold(queue: name),
+            },
+          }
+        end,
+      }
+    end
+
+    def queues
+      raise "This method must be overriden to be a hash of queue names and data."
+    end
+
+    def critical_threshold(queue:)
+      raise "This method must be overriden to be the critical threshold."
+    end
+
+    def warning_threshold(queue:)
+      raise "This method must be overriden to be the warning threshold."
+    end
+  end
+end

data/lib/govuk_app_config/govuk_healthcheck/sidekiq_queue_latency_check.rb

@@ -0,0 +1,13 @@
+module GovukHealthcheck
+  class SidekiqQueueLatencyCheck < SidekiqQueueCheck
+    def name
+      :sidekiq_queue_latency
+    end
+
+    def queues
+      @queues ||= Sidekiq::Stats.new.queues.keys.each_with_object({}) do |name, hash|
+        hash[name] = Sidekiq::Queue.new(name).latency
+      end
+    end
+  end
+end

data/lib/govuk_app_config/govuk_healthcheck/sidekiq_queue_size_check.rb

@@ -0,0 +1,11 @@
+module GovukHealthcheck
+  class SidekiqQueueSizeCheck < SidekiqQueueCheck
+    def name
+      :sidekiq_queue_size
+    end
+
+    def queues
+      @queues ||= Sidekiq::Stats.new.queues
+    end
+  end
+end

data/lib/govuk_app_config/govuk_healthcheck/sidekiq_retry_size_check.rb

@@ -0,0 +1,11 @@
+module GovukHealthcheck
+  class SidekiqRetrySizeCheck < ThresholdCheck
+    def name
+      :sidekiq_retry_size
+    end
+
+    def value
+      Sidekiq::Stats.new.retry_size
+    end
+  end
+end

data/lib/govuk_app_config/govuk_healthcheck/threshold_check.rb

@@ -0,0 +1,50 @@
+module GovukHealthcheck
+  class ThresholdCheck
+    def status
+      if value >= critical_threshold
+        :critical
+      elsif value >= warning_threshold
+        :warning
+      else
+        :ok
+      end
+    end
+
+    def message
+      if value >= critical_threshold
+        "#{value} is above the critical threshold (#{critical_threshold})"
+      elsif value >= warning_threshold
+        "#{value} is above the warning threshold (#{warning_threshold})"
+      else
+        "#{value} is below the critical and warning thresholds"
+      end
+    end
+
+    def details
+      {
+        value: value,
+        total: total,
+        thresholds: {
+          critical: critical_threshold,
+          warning: warning_threshold,
+        },
+      }
+    end
+
+    def value
+      raise "This method must be overridden to be the check value."
+    end
+
+    def total
+      nil # This method can be overriden to provide the total for the check.
+    end
+
+    def critical_threshold
+      raise "This method must be overriden to be the critical threshold."
+    end
+
+    def warning_threshold
+      raise "This method must be overriden to be the warning threshold."
+    end
+  end
+end

data/lib/govuk_app_config/govuk_healthcheck.rb

@@ -1,6 +1,11 @@
 require "govuk_app_config/govuk_healthcheck/checkup"
 require "govuk_app_config/govuk_healthcheck/active_record"
 require "govuk_app_config/govuk_healthcheck/sidekiq_redis"
+require "govuk_app_config/govuk_healthcheck/threshold_check"
+require "govuk_app_config/govuk_healthcheck/sidekiq_queue_check"
+require "govuk_app_config/govuk_healthcheck/sidekiq_queue_latency_check"
+require "govuk_app_config/govuk_healthcheck/sidekiq_queue_size_check"
+require "govuk_app_config/govuk_healthcheck/sidekiq_retry_size_check"
 require "json"
 
 module GovukHealthcheck

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-29 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: statsd-ruby
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.6.0
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: climate_control
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +182,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docs/healthchecks.md
 - govuk_app_config.gemspec
 - lib/govuk_app_config.rb
 - lib/govuk_app_config/configure.rb
@@ -175,7 +190,12 @@ files:
 - lib/govuk_app_config/govuk_healthcheck.rb
 - lib/govuk_app_config/govuk_healthcheck/active_record.rb
 - lib/govuk_app_config/govuk_healthcheck/checkup.rb
+- lib/govuk_app_config/govuk_healthcheck/sidekiq_queue_check.rb
+- lib/govuk_app_config/govuk_healthcheck/sidekiq_queue_latency_check.rb
+- lib/govuk_app_config/govuk_healthcheck/sidekiq_queue_size_check.rb
 - lib/govuk_app_config/govuk_healthcheck/sidekiq_redis.rb
+- lib/govuk_app_config/govuk_healthcheck/sidekiq_retry_size_check.rb
+- lib/govuk_app_config/govuk_healthcheck/threshold_check.rb
 - lib/govuk_app_config/govuk_logging.rb
 - lib/govuk_app_config/govuk_statsd.rb
 - lib/govuk_app_config/govuk_unicorn.rb