sensu-plugins-rancher-service 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 733f6b091e0c340300b859ab196ed30958b11488
-  data.tar.gz: 1d6c3a6cff8c5c122ac7f9148729ff84a584830d
+  metadata.gz: 71c8cb06af349269d6e9fe1718c5e9546e39ba52
+  data.tar.gz: 3a1652de0d542be637cb307cf7aa6c42b66f5ce3
 SHA512:
-  metadata.gz: 03b1f30bff046ea286d5a5cf308df602a606fe462119939c809b466eedfd319f571796d9ea83531974eb57c8ca06e246278ebe42ee4c2239bb8e205cf507a53f
-  data.tar.gz: ea216460b180bd73af863f3bc82551328d77d3292696d25e06838684b5df4aee533ef7f84991c438d1c0cd784f85b898beeed50109b6abf800f7ffefb03df0aa
+  metadata.gz: 08c53b953ec690c86b3a01150f65b703062c03aaaccb36615f1562a72f7c93d6b02f798e60d8e9d794b97255a23ca28904ff5861cfbdfdb6a0335be071f9d6c1
+  data.tar.gz: 827d3d2609ce4803ada2f6a41aac4812c4e7314c56d98b98c1db547ff26fc9147fe8016ec0412d4007281c6a641a2cfc0f3f2b8bcab628afae37a2ed3b8a6106

data/bin/check-rancher-service.rb

@@ -9,6 +9,7 @@ require 'sensu-plugin/check/cli'
 require 'net/http'
 require 'json'
 require 'fileutils'
+require 'rancher-metadata/api'
 
 class CheckRancherService < Sensu::Plugin::Check::CLI
   option :api_url,
@@ -40,6 +41,7 @@ class CheckRancherService < Sensu::Plugin::Check::CLI
     # prepare state directory
     FileUtils.mkdir_p(config[:state_dir]) unless File.directory?(config[:state_dir])
 
+    @metadata_api = RancherMetadata::API.new({:api_url => "http://rancher-metadata/2015-12-19"})
     @state_file = config[:state_dir] + "/containers.json"
   end
 
@@ -84,39 +86,6 @@ class CheckRancherService < Sensu::Plugin::Check::CLI
     send_client_socket(event.to_json)
   end
 
-  def is_error?(data)
-    if data.is_a?(Hash) and data.has_key?('code') and data['code'] == 404
-      return true
-    else
-      return false
-    end
-  end
-
-  def api_get(query)
-    begin
-      uri = URI.parse("#{config[:api_url]}#{query}")
-      req = Net::HTTP::Get.new(uri.path, {'Content-Type' => 'application/json', 'Accept' => 'application/json'})
-      resp = Net::HTTP.new(uri.host, uri.port).request(req)
-      data = JSON.parse(resp.body)
-
-      if is_error?(data)
-        return nil
-      else
-        return data
-      end
-    rescue
-      raise "Failed to query Rancher Metadata API - Caught exception (#{$!})"
-    end
-  end
-
-  def get_services()
-    api_get("/services")
-  end
-
-  def get_container(name)
-    api_get("/containers/#{name}")
-  end
-
   def run
     unmonitored = 0
     unhealthy = 0
@@ -124,7 +93,7 @@ class CheckRancherService < Sensu::Plugin::Check::CLI
     # read current state
     state = read_state()
 
-    get_services().each do |service|
+    self.metadata_api.get_services.each do |service|
       source = "#{service['stack_name']}_#{service['name']}.rancher.internal"
 
       if service['metadata'].has_key?('sensu') and service['metadata']['sensu'].has_key?('monitored')
@@ -134,30 +103,28 @@ class CheckRancherService < Sensu::Plugin::Check::CLI
       end
 
       # get containers
-      service['containers'].each do |container_name|
-        check_name = "rancher-container-#{container_name}-state"
-        msg = "Instance #{container_name}"
+      service['containers'].each do |container|
+        check_name = "rancher-container-#{container['name']}-state"
+        msg = "Instance #{container['name']}"
 
         unless monitored
           send_ok(check_name, source, "#{msg} not monitored (disabled)")
         else
-          container = get_container(container_name)
-
           if container['labels'].has_key?('io.rancher.container.start_once') and container['labels']['io.rancher.container.start_once']
             send_ok(check_name, source, "#{msg} not monitored (start-once)")
           else
             skip = false
-            if state.has_key?(container_name)
-              if container['start_count'] > state[container_name]['start_count']
+            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] = {}
+              state[container['name']] = {}
             end
 
             # update state
-            state[container_name]['start_count'] = container['start_count']
+            state[container['name']]['start_count'] = container['start_count']
 
             next if skip
 

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

@@ -2,7 +2,7 @@ module SensuPluginsRancherService
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 15
+    PATCH = 16
 
     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.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Matteo Cerutti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -24,6 +24,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: rancher-metadata
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.17.14
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.17.14
 description: This plugin provides facilities for monitoring services running in Rancher
 email: "<matteo.cerutti@hotmail.co.uk>"
 executables: