sensu-plugins-fetch-letsencrypt 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8b6740d363e393076fa616cfb08b710a4b8083c
-  data.tar.gz: 020cb93ced1b775fe263c76da4726f2f740f8ac1
+  metadata.gz: 5900ddf5cb4ed32af8da8299654af2c7104d7c07
+  data.tar.gz: 1f0027b2876012041c4bf7cb80fca10a72e4a990
 SHA512:
-  metadata.gz: 74f88a688446abb12a1b45740950fbc06f7465c0c6570af3afdbe8563016cabc189aac2724df313affb0327518e95e818cf643172bfddfd5d5bae04378d89e56
-  data.tar.gz: 2efd62d6d004ebaf7df3024397821d1cd76dc81cf6ec7b47164faf3269e0788cc93805dac769e2138d444e793889ba36ee77f9188fd0787ee14db6f4c845691f
+  metadata.gz: df10ac5400070abd49451e5576af3565d26226eb06c8fe37175c6785e2ae1c52ff287219f0f88a1eee3445af163dce8d55bf78f7e2948ef37091a08e356e6759
+  data.tar.gz: 1da2e8b28f55383256acff338ee495542a5cdbbabaad27b49ce5fc180e39c8a83e39365ce2cfa02d0a10847c8d90ba0cb1e29368f7eb98de2fe31c1f9f20fe52

data/bin/check-fetch-letsencrypt-cronjob.rb

@@ -15,14 +15,6 @@
 #   gem: sensu-plugin
 #
 # USAGE:
-#   check-container-logs.rb -H /tmp/docker.sock -n logspout -r 'problem sending' -r 'i/o timeout' -i 'Remark:' -i 'The configuration is'
-#   => 1 container running = OK
-#   => 4 container running = CRITICAL
-#
-# NOTES:
-#   The API parameter required to use the limited lookback (-t) was introduced
-#   the Docker server API version 1.19. This check may still work on older API
-#   versions if you don't want to limit the timestamps of logs.
 #
 #
 
@@ -34,27 +26,37 @@ class FetchLetsencryptCronjobChecker < Sensu::Plugin::Check::CLI
          short: '-c /etc/cron.d/fetch-letsencrypt',
          long: '--fetch-letsencrypt-cronjob /etc/cron.d/fetch-letsencrypt',
          default: '/etc/cron.d/fetch-letsencrypt'
+  
+  option :only_if_file_exists,
+         description: 'marker file - test will only be issued if this file exists',
+         short: '-o <path to marker file>',
+         long: '--only-if-file-exists <path to marker file>',
+         default: nil
 
   def run
-    if File.file?(config[:fetch_letsencrypt_cronjob])
-      unless File.open(config[:fetch_letsencrypt_cronjob]).grep(/^#.*fetch-letsencrypt.sh$/).empty?
-        age = Time.now.to_i - File.mtime(config[:fetch_letsencrypt_cronjob]).to_i
-        if age > 1800 && age <= 86_400
-          warning "fetch-letsencrypt cronjob #{config[:fetch_letsencrypt_cronjob]} exists but is inactive for more than thirty minuntes (#{age}s)!"
-        elsif age > 86_400
-          critical "fetch-letsencrypt cronjob #{config[:fetch_letsencrypt_cronjob]} exists but is inactive for more than one day (#{age}s)!"
+    if config[:only_if_file_exists].nil? || (config[:only_if_file_exists] && File.file?(config[:only_if_file_exists]))
+      if File.file?(config[:fetch_letsencrypt_cronjob])
+        unless File.open(config[:fetch_letsencrypt_cronjob]).grep(/^#.*fetch-letsencrypt.sh$/).empty?
+          age = Time.now.to_i - File.mtime(config[:fetch_letsencrypt_cronjob]).to_i
+          if age > 1800 && age <= 86_400
+            warning "fetch-letsencrypt cronjob #{config[:fetch_letsencrypt_cronjob]} exists but is inactive for more than thirty minuntes (#{age}s)!"
+          elsif age > 86_400
+            critical "fetch-letsencrypt cronjob #{config[:fetch_letsencrypt_cronjob]} exists but is inactive for more than one day (#{age}s)!"
+          else
+            ok "fetch-letsencrypt cronjob exists but is temporarily inactive (#{age}s)."
+          end
         else
-          ok "fetch-letsencrypt cronjob exists but is temporarily inactive (#{age}s)."
+          if File.open(config[:fetch_letsencrypt_cronjob]).grep(/^.*fetch-letsencrypt.sh$/).empty?
+            critical "fetch-letsencrypt cronjob #{config[:fetch_letsencrypt_cronjob]} exists but has no call on fetch-letsencrypt.sh"
+          else
+            ok "fetch-letsencrypt cronjob #{config[:fetch_letsencrypt_cronjob]} exists and is active."
+          end
         end
       else
-        if File.open(config[:fetch_letsencrypt_cronjob]).grep(/^.*fetch-letsencrypt.sh$/).empty?
-          critical "fetch-letsencrypt cronjob #{config[:fetch_letsencrypt_cronjob]} exists but has no call on fetch-letsencrypt.sh"
-        else
-          ok "fetch-letsencrypt cronjob #{config[:fetch_letsencrypt_cronjob]} exists and is active."
-        end
+        critical "fetch-letsencrypt cronjob #{config[:fetch_letsencrypt_cronjob]} NOT found!"
       end
     else
-      critical "fetch-letsencrypt cronjob #{config[:fetch_letsencrypt_cronjob]} NOT found!"
+      ok "fetch-letsencrypt cronjob #{config[:fetch_letsencrypt_cronjob]} exists but is intentionally not active (--only-if-file-exists is set watching this file: #{config[:only_if_file_exists]})."
     end
   end
 end

data/lib/sensu-plugins-fetch-letsencrypt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-fetch-letsencrypt
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for fetch-letsencrypt