sensu-plugins-rancher-service 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd66af46962dbd0edf412f8469ff73df0a69b9f4
-  data.tar.gz: aaa3667a6a37a66431e04bb761e2591066a9d539
+  metadata.gz: ecd15143ee7c796993359fdb3ec314a246d0e91c
+  data.tar.gz: 943f0b833aa43e00c95a1b444c81bfe7fbd6dc2c
 SHA512:
-  metadata.gz: 0efe09234e8f37c3c6f545a30e13b1dec35fef0b244aa60ace0e6b9d4f5daa2cec71d7bfa05a378e635ebbc7958f027cad21a286d0991942eee489a82a7530e7
-  data.tar.gz: 38655493204550df98f1652b2deecaa6db0fa01540c7a6d043f8708cd61cd8b05d8dd345c45a234c89dc2eab1566c4d1170eb6b619d792db21bd650ad09fd5da
+  metadata.gz: bddaef888e41d5a2210a5ff9e940e3569dc6759fea3c32d94930d79c0ac7a5fe6fb93bc57c33f60dd0cd1674af39d8932fda78570cd9ee5280c299812e7ce750
+  data.tar.gz: f31ec907c036e90263383c1e79668145fdc01a737299457acd6d0b0cf7737ecf172059f44a19e60e73479dd1ed05e1ff29cce38a01526dcca3620de0797199d4

data/CHANGELOG.md

@@ -5,6 +5,11 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## Unreleased
 
+## [0.0.8] - 2016-01-17
+### Added
+- Detecting when a service instance restarts
+- Adding check on service state
+
 ## [0.0.7] - 2016-01-14
 ### Added
 - Added --handlers command line option

data/bin/check-rancher-service.rb

@@ -16,6 +16,11 @@ class CheckRancherService < Sensu::Plugin::Check::CLI
          :proc => proc { |s| s.gsub(/\/$/, '') },
          :default => "http://rancher-metadata/2015-07-25"
 
+  option :state_dir,
+         :description => "State directory",
+         :long => "--state-dir <PATH> (default: /var/cache/check-rancher-service)",
+         :default => "/var/cache/check-rancher-service"
+
   option :handlers,
          :description => "Comma separated list of handlers",
          :long => "--handlers <HANDLER>",
@@ -30,6 +35,23 @@ class CheckRancherService < Sensu::Plugin::Check::CLI
 
   def initialize()
     super
+
+    # prepare state directory
+    FileUtils.mkdir_p(config[:state_dir]) unless File.directory?(config[:state_dir])
+
+    @state_file = config[:state_dir] + "/containers.json"
+  end
+
+  def read_state()
+    if File.exists?(@state_file)
+      JSON.parse(File.read(@state_file))
+    else
+      {}
+    end
+  end
+
+  def write_state(state)
+    File.open(@state_file, 'w') { |f| f.write(state) }
   end
 
   def send_client_socket(data)
@@ -98,6 +120,9 @@ class CheckRancherService < Sensu::Plugin::Check::CLI
     unmonitored = 0
     unhealthy = 0
 
+    # read current state
+    state = read_state()
+
     get_services().each do |service|
       source = "#{service['stack_name']}_#{service['name']}.rancher.internal"
 
@@ -109,14 +134,31 @@ class CheckRancherService < Sensu::Plugin::Check::CLI
 
       # get containers
       service['containers'].each do |container_name|
-        check_name = "rancher-container-#{container_name}-health_state"
+        check_name = "rancher-container-#{container_name}-state"
         msg = "Instance #{container_name}"
 
         unless monitored
           send_ok(check_name, source, "#{msg} not monitored (disabled)")
         else
-          health_state = get_container(container_name)['health_state']
-          case health_state
+          container = get_container(container_name)
+
+          skip = false
+          if state.has_key?(container_name)
+            if container['start_count'] > state[container_name]['start_count']
+              send_warning(check_name, source, "#{msg} has restarted"
+              skip = true
+            end
+          else
+            state[container_name] = {}
+          end
+
+          # update state
+          state[container_name]['start_count'] = container['start_count']
+
+          next if skip
+
+          # check if the service restarted
+          case container['health_state']
             when 'healthy'
               send_ok(check_name, source, "#{msg} is healthy")
 
@@ -132,6 +174,17 @@ class CheckRancherService < Sensu::Plugin::Check::CLI
       end
     end
 
+    # persist state to disk
+    write_state(state)
+
+    # check service scale size to determine whether it's degraded or not
+    check_name = "rancher-service-state"
+    if service['containers'].size < service['scale']
+      send_warning(check_name, source, "Service is in a degraded state - Current: #{service['containers'].size} (Scale: #{service['scale']})")
+    else
+      send_ok(check_name, source, "Service is healthy")
+    end
+
     critical("Found #{unhealthy} unhealthy instances") if unhealthy > 0
     warning("Found #{unmonitored} instances not begin monitored") if unmonitored > 0
     ok("All Rancher services instances are healthy")

data/lib/sensu-plugins-rancher-service/version.rb

@@ -2,7 +2,7 @@ module SensuPluginsRancherService
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 7
+    PATCH = 8
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-rancher-service
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Matteo Cerutti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin