sensu-plugins-barman-checks 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b81b372aaffa116262d0e7513a82fff5fca4e1d7
-  data.tar.gz: 38d785b4dad4994c3625e04fa9d150619b73c103
+  metadata.gz: ec819915c39c84e17b07a19c07a12b73a5ecb596
+  data.tar.gz: 8a4e38db7934ee6256d1d82bf37d3feb6607f62c
 SHA512:
-  metadata.gz: 87a4910384d302ebebc37327a42a90d2dfdd66512d4e24168037caf93cffb60091ee67d930bf616a9ce414b89e8b36a3d5cafcaee636b7df724ac344022b09e8
-  data.tar.gz: a2d87b0dd6707eb00f1a04a338cf87bf38d0fd0a4b50d1a2657617eafcc72bd70e4bbbf92ee0734de74f41468c1ec3c7f42c10cd8eebc2680f529c1af6401593
+  metadata.gz: 6f40c89144542f201f1c563c473aab631c2ec2237f07c6e2365908f44f44baf0dcae706cab5110c6f15dfc3dd52d18301f713ccb973e9694a4ecd9327c98fc3e
+  data.tar.gz: 8a2c4305e44f14b226ad0768fae00da6b40d1abd408e03c7929001339d98522fe3b01ee8eed27fdf075d493cd6a7ee082c715ebc2c4d076fa190c67e7cf2afb3

data/CHANGELOG.md

@@ -5,6 +5,13 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## 0.0.6 - 2016-11-30
+### Fixed
+- Fix another race condition caused by barman cli relating to backup availability
+
+### Removed
+- Remove warning option
+
 ## 0.0.5 - 2016-11-30
 ### Fixed
 - Fix race condition caused by barman cli where status for a backup is not available if it is in progress or failed.

data/README.md

@@ -22,7 +22,7 @@ This plugin requires the use of sudo, as barman requires either the barman user
 
 `Defaults:sensu !requiretty`
 
-`/path_to_sensu/embedded/bin/ruby /path_to_sensu/embedded/bin/check-barman-backup-status.rb [-m MIN_NUMBER_BACKUPS] [--max-age MAX_AGE_IN_HOURS_OF_LATEST_BACKUP] [--warn WARN_AGE_IN_HOURS_OF_LATEST_BACKUP]`
+`/path_to_sensu/embedded/bin/ruby /path_to_sensu/embedded/bin/check-barman-backup-status.rb [-m MIN_NUMBER_BACKUPS] [--max-age MAX_AGE_IN_HOURS_OF_LATEST_BACKUP]`
 
 ## Installation
 

data/bin/check-barman-backup-status.rb

@@ -37,13 +37,6 @@ class CheckBarmanBackupStatus < Sensu::Plugin::Check::CLI
          required:    true,
          default:     1
 
-  option :warn_age,
-         description: 'The maximum age of backup before warning (in hours)',
-         short:       '-w',
-         long:        '--warn-age',
-         required:    true,
-         default:     24
-
   option :max_age,
          description: 'The maximum age of backup before critical alert (in hours)',
          long:        '--max-age',
@@ -65,7 +58,6 @@ class CheckBarmanBackupStatus < Sensu::Plugin::Check::CLI
   def run
     start_time = Time.now
     @crit = []
-    @warn = []
 
     servers = `sudo barman list-server | awk '{print $1}'`.split(/\n/).map(&:strip)
 
@@ -77,10 +69,6 @@ class CheckBarmanBackupStatus < Sensu::Plugin::Check::CLI
         }
       }
 
-      @backup_hash = {
-        server.to_s => {}
-      }
-
       # No YAML or other supported output to parse so we'll have to do it manually
       server_attrs = `sudo barman show-server #{server}`.split(/\n/).map(&:strip)
       server_attrs.each do |attr|
@@ -113,13 +101,17 @@ class CheckBarmanBackupStatus < Sensu::Plugin::Check::CLI
         next
       elsif backups.count < config[:min_backups].to_i && backups.count > 0
         @crit << "Minimum backups not met for server #{server}.  Count is #{backups.count}"
-      else
-        puts "Number of backups for server #{server}: #{backups.count}"
       end
+      puts "Number of backups for server #{server}: #{backups.count}"
+
+      @latest = @server_hash[server]['status']['Last available backup']
 
       backups.each do |backup|
         stupid_barman_cli = `sudo barman list-backup #{server} | grep #{backup} | awk '{print $4}'`.strip
         if stupid_barman_cli.casecmp('started')
+          if backup == @latest
+            @skip_latest = true
+          end
           puts "Backup ID #{backup} for server #{server} is in progress. Skipping further checking on it"
           next
         elsif stupid_barman_cli.casecmp('failed')
@@ -133,28 +125,25 @@ class CheckBarmanBackupStatus < Sensu::Plugin::Check::CLI
         end
       end
 
-      latest = @server_hash[server]['status']['Last available backup']
-      latest_time = Time.parse(`sudo barman show-backup #{server} #{latest} | grep 'Begin time' | awk '{print $4,$5}'`.strip)
-      backup_age = time_diff(latest_time, start_time).to_i
+      if @skip_latest == true
+        puts 'Latest backup is in progress. Skipping age check.'
+      else
+        latest_time = Time.parse(`sudo barman show-backup #{server} #{@latest} | grep 'Begin time' | awk '{print $4,$5}'`.strip)
 
-      if backup_age > config[:warn_age].to_i
-        @warn << "Warning threshold for backup age exceeded for latest backup on server #{server}.  Age is #{backup_age} hour(s)"
-      end
+        backup_age = time_diff(latest_time, start_time).to_i
 
-      if backup_age > config[:max_age].to_i
-        @crit << "Maximum age exceeded for latest backup on server #{server}. Age is: #{backup_age} hour(s)"
-      else
+        if backup_age > config[:max_age].to_i
+          @crit << "Maximum age exceeded for latest backup on server #{server}. Age is: #{backup_age} hour(s)"
+        end
         puts "Age of latest backup for server #{server}: #{backup_age} hour(s)"
       end
     end
 
     # Assuming we got this far, exit cleanly
-    if @crit.empty? && @warn.empty?
+    if @crit.empty?
       ok 'Recent backups exist for each configured server. Each configured server is also active and in a good state.'
-    elsif !@crit.empty?
+    else
       critical "critical: #{@crit}"
-    elsif !@warn.empty?
-      warning "warning: #{@warn}"
     end
   end
 end

data/lib/sensu-plugins-barman-checks/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-barman-checks
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Scott Brimhall
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin