summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/oxidized/config.rb1
-rw-r--r--lib/oxidized/node.rb3
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/oxidized/config.rb b/lib/oxidized/config.rb
index b6b5c40..c97fa2f 100644
--- a/lib/oxidized/config.rb
+++ b/lib/oxidized/config.rb
@@ -20,6 +20,7 @@ module Oxidized
asetus.default.username = 'username'
asetus.default.password = 'password'
asetus.default.model = 'junos'
+ asetus.deefault.resolve_dns = true # if false, don't resolve DNS to IP
asetus.default.interval = 3600
asetus.default.use_syslog = false
asetus.default.debug = false
diff --git a/lib/oxidized/node.rb b/lib/oxidized/node.rb
index 6f89b56..7201a73 100644
--- a/lib/oxidized/node.rb
+++ b/lib/oxidized/node.rb
@@ -14,7 +14,8 @@ module Oxidized
ip_addr, _ = opt[:ip].to_s.split("/")
Oxidized.logger.debug 'IPADDR %s' % ip_addr.to_s
@name = opt[:name]
- @ip = IPAddr.new(ip_addr).to_s rescue nil
+ @ip = @name unless Oxidized.config.resolve_dns?
+ @ip ||= IPAddr.new(ip_addr).to_s rescue nil
@ip ||= Resolv.new.getaddress @name
@group = opt[:group]
@input = resolve_input opt