sensu-plugins-mofa 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44f26402dc9c66313e7537c335c40cf502a78d25
-  data.tar.gz: 1850162b053e9dd7921c13933777bd7d65c296cb
+  metadata.gz: ba8abb23f73feb549df1a072e2c49ccedc28a4f1
+  data.tar.gz: 3b4817c540114fc572343e9d499b819121af0937
 SHA512:
-  metadata.gz: 109a9faf22bb01d62cb15e9ae01215374ee596cd96aa256bda0edb1ff2a9373c3351a279e8e975f8f1f4b07162ae78d70de8d95f62487490914c200c992ca0ef
-  data.tar.gz: 2c0977288e7c81e8fa1674708ecdf10f4f3934c40056c7db7f9c0c384437749ff0b4343743298cb484fbf7178cb91d50c0da30563ce1d7318e91e6accadcc17e
+  metadata.gz: 5c1fd3cfa5518df99bf4828b73facaea0f6c4d48918b4db7df948bd00ccc673dc84ab7d47e2b07fc71d6347dda4f541e1087b432266b5ac978a64b421302a042
+  data.tar.gz: 703ae62daefee4e9bcae7efd41b6a1c52c337a2ddb58ff7a2ca516921b3d07edbf9bd4b804870678805cb665f2e8ee70c6a8f0ec6da2a1011317ee6f1109f2dc

data/bin/check-mofa-provisioning.rb

@@ -29,35 +29,45 @@
 require 'sensu-plugin/check/cli'
 
 class MofaProvisioningChecker < Sensu::Plugin::Check::CLI
-  option :mofa_status_file,
+  option :mofa_status_dir,
          description: 'Mofa Status dir - defaults to /var/lib/mofa',
          short: '-s /var/lib/mofa',
-         long: '--mofa-status-file /var/lib/mofa',
+         long: '--mofa-status-dir /var/lib/mofa',
          default: '/var/lib/mofa'
 
   def process_mofa_status_dir(mofa_status_dir)
     data = { result: 'UNKNOWN' }
-    if File.file?(mofa_status_dir)
-      status = File.read(mofa_status_file).chomp
+    if File.file?("#{mofa_status_dir}/last_status")
+      status = File.read("#{mofa_status_dir}/last_status").chomp
       case
       when status =~ /SUCCESS/
-        data.result = 'SUCCESS'
+        data['result'] = 'SUCCESS'
       when status =~ /FAIL/
-        data.result = 'FAIL'
+        data['result'] = 'FAIL'
       end
     end
     data
   end
 
+  def read_mofa_status_file(mofa_status_dir, status_file)
+    content = ''
+    puts status_file
+    puts "#{mofa_status_dir}/#{status_file}"
+    if File.file?("#{mofa_status_dir}/#{status_file}")
+      content = File.read("#{mofa_status_dir}/#{status_file}").chomp
+    end
+    content
+  end
+
   def run
     data = process_mofa_status_dir(config[:mofa_status_dir])
-    case data.result
-    when 'UNKNOWN'
-      unknown 'Cannot detect any mofa provisining (no cookbook info found).'
+    case data['result']
     when 'SUCCESS'
-      ok 'Last mofa provisioning was successful ()'
+      ok "Last mofa provisioning was successful (#{read_mofa_status_file(config[:mofa_status_dir], 'last_cookbook_name')}@#{read_mofa_status_file(config[:mofa_status_dir], 'last_cookbook_version')})"
     when 'FAIL'
-      critical 'Last mofa provisioning failed! ()'
+      critical "Last mofa provisioning failed! (#{read_mofa_status_file(config[:mofa_status_dir], 'last_cookbook_name')}@#{read_mofa_status_file(config[:mofa_status_dir], 'last_cookbook_version')})"
+    else
+      unknown 'Cannot detect any mofa provisining (no cookbook info found).'
     end
   end
 end

data/lib/sensu-plugins-mofa/version.rb

@@ -1,8 +1,8 @@
 module SensuPluginsMofa
   module Version
     MAJOR = 0
-    MINOR = 0
-    PATCH = 3
+    MINOR = 1
+    PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-mofa
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2017-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin