diff options
| author | ytti <saku@ytti.fi> | 2015-11-06 13:05:36 +0200 |
|---|---|---|
| committer | ytti <saku@ytti.fi> | 2015-11-06 13:05:36 +0200 |
| commit | d3e715c59a269e7e69b9f8e5c0a29c78eed7dd2e (patch) | |
| tree | ae926bef9ec3aeed0b3ecd8c4b7907153f10aeaa | |
| parent | c0dc2ee2af5b6be0b237fa5a6cb60aed14943466 (diff) | |
| parent | dc5f7285c87dc45763a24636a95c4081552356de (diff) | |
Merge pull request #233 from marnovdm/feature/minor-tweaks
Some minor tweaks for Oxidized
| -rw-r--r-- | extra/nagios_check_failing_nodes.rb | 8 | ||||
| -rw-r--r-- | lib/oxidized/node.rb | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/extra/nagios_check_failing_nodes.rb b/extra/nagios_check_failing_nodes.rb index 27a5c66..abb34ba 100644 --- a/extra/nagios_check_failing_nodes.rb +++ b/extra/nagios_check_failing_nodes.rb @@ -23,12 +23,12 @@ json.each do |node| end end -if pending - puts '[WARN] Pending backup: ' + pending_nodes.join(',') - exit 1 -elsif critical +if critical puts '[CRIT] Unable to backup: ' + critical_nodes.join(',') exit 2 +elsif pending + puts '[WARN] Pending backup: ' + pending_nodes.join(',') + exit 1 else puts '[OK] Backup of all nodes completed successfully.' exit 0 diff --git a/lib/oxidized/node.rb b/lib/oxidized/node.rb index d50317f..c847416 100644 --- a/lib/oxidized/node.rb +++ b/lib/oxidized/node.rb @@ -9,6 +9,9 @@ module Oxidized attr_accessor :running, :user, :msg, :from, :stats, :retry alias :running? :running def initialize opt + if CFG.debug == true or opt[:debug] == true + puts 'resolving DNS for %s...' % opt[:name] + end @name = opt[:name] @ip = IPAddr.new(opt[:ip]).to_s rescue nil @ip ||= Resolv.new.getaddress @name |