oxidized 0.32.1 → 0.34.0

data/lib/oxidized/hook/xmppdiff.rb

@@ -5,35 +5,35 @@ class XMPPDiff < Oxidized::Hook
   def connect
     @client = Jabber::Client.new(Jabber::JID.new(cfg.jid))
 
-    log "Connecting to XMPP"
+    logger.info "Connecting to XMPP"
     begin
       Timeout.timeout(15) do
         begin
           @client.connect
         rescue StandardError => e
-          log "Failed to connect to XMPP: #{e}"
+          logger.info "Failed to connect to XMPP: #{e}"
         end
         sleep 1
 
-        log "Authenticating to XMPP"
+        logger.info "Authenticating to XMPP"
         @client.auth(cfg.password)
         sleep 1
 
-        log "Connected to XMPP"
+        logger.info "Connected to XMPP"
 
         @muc = Jabber::MUC::SimpleMUCClient.new(@client)
         @muc.join(cfg.channel + "/" + cfg.nick)
 
-        log "Joined #{cfg.channel}"
+        logger.info "Joined #{cfg.channel}"
       end
     rescue Timeout::Error
-      log "timed out"
+      logger.info "timed out"
       @client = nil
       @muc = nil
     end
 
     @client.on_exception do
-      log "XMPP connection aborted, reconnecting"
+      logger.info "XMPP connection aborted, reconnecting"
       @client = nil
       @muc = nil
       connect
@@ -66,14 +66,14 @@ class XMPPDiff < Oxidized::Hook
           # Maybe connecting failed, so only proceed if we actually joined the MUC
           unless @muc.nil?
             title = "#{ctx.node.name} #{ctx.node.group} #{ctx.node.model.class.name.to_s.downcase}"
-            log "Posting diff as snippet to #{cfg.channel}"
+            logger.info "Posting diff as snippet to #{cfg.channel}"
 
             @muc.say(title + "\n\n" + diff[:patch].lines.to_a[4..-1].join)
           end
         end
       end
     rescue Timeout::Error
-      log "timed out"
+      logger.info "timed out"
     end
   end
 end

data/lib/oxidized/hook.rb

@@ -1,5 +1,7 @@
 module Oxidized
   class HookManager
+    include SemanticLogger::Loggable
+
     class << self
       def from_config(cfg)
         mgr = new
@@ -14,7 +16,9 @@ module Oxidized
 
     # HookContext is passed to each hook. It can contain anything related to the
     # event in question. At least it contains the event name
-    class HookContext < OpenStruct; end
+    # The argument keyword_init: true is needed for ruby < 3.2 and can be
+    # dropped with the support of ruby 3.1
+    HookContext = Struct.new(:event, :node, :job, :commitref, keyword_init: true)
 
     # RegisteredHook is a container for a Hook instance
     RegisteredHook = Struct.new(:name, :hook)
@@ -47,7 +51,7 @@ module Oxidized
       hook.cfg = cfg
 
       @registered_hooks[event] << RegisteredHook.new(name, hook)
-      Oxidized.logger.debug "Hook #{name.inspect} registered #{hook.class} for event #{event.inspect}"
+      logger.debug "Hook #{name.inspect} registered #{hook.class} for event #{event.inspect}"
     end
 
     def handle(event, ctx_params = {})
@@ -57,14 +61,16 @@ module Oxidized
       @registered_hooks[event].each do |r_hook|
         r_hook.hook.run_hook ctx
       rescue StandardError => e
-        Oxidized.logger.error "Hook #{r_hook.name} (#{r_hook.hook}) failed " \
-                              "(#{e.inspect}) for event #{event.inspect}"
+        logger.error "Hook #{r_hook.name} (#{r_hook.hook}) failed " \
+                     "(#{e.inspect}) for event #{event.inspect}"
       end
     end
   end
 
   # Hook abstract base class
   class Hook
+    include SemanticLogger::Loggable
+
     attr_reader :cfg
 
     def cfg=(cfg)
@@ -75,9 +81,5 @@ module Oxidized
     def run_hook(_ctx)
       raise NotImplementedError
     end
-
-    def log(msg, level = :info)
-      Oxidized.logger.send(level, "#{self.class.name}: #{msg}")
-    end
   end
 end

data/lib/oxidized/input/cli.rb

@@ -20,15 +20,16 @@ module Oxidized
       end
 
       def connect_cli
-        Oxidized.logger.debug "lib/oxidized/input/cli.rb: Running post_login commands at #{node.name}"
+        logger.debug "Running post_login commands at #{node.name}"
         @post_login.each do |command, block|
-          Oxidized.logger.debug "lib/oxidized/input/cli.rb: Running post_login command: #{command.inspect}, block: #{block.inspect} at #{node.name}"
+          logger.debug "Running post_login command: #{command.inspect}, " \
+                       "block: #{block.inspect} at #{node.name}"
           block ? block.call : (cmd command)
         end
       end
 
       def disconnect_cli
-        Oxidized.logger.debug "lib/oxidized/input/cli.rb Running pre_logout commands at #{node.name}"
+        logger.debug "Running pre_logout commands at #{node.name}"
         @pre_logout.each { |command, block| block ? block.call : (cmd command, nil) }
       end
 
@@ -52,6 +53,10 @@ module Oxidized
         @password || (@password = regex)
       end
 
+      def newline(newline_str = "\n")
+        @newline || (@newline = newline_str)
+      end
+
       def login
         match_re = [@node.prompt]
         match_re << @username if @username

data/lib/oxidized/input/exec.rb

@@ -11,7 +11,7 @@ module Oxidized
     end
 
     def cmd(cmd_str)
-      Oxidized.logger.debug "EXEC: #{cmd_str} @ #{@node.name}"
+      logger.debug "EXEC: #{cmd_str} @ #{@node.name}"
       # I'd really like to do popen3 with separate arguments, but that would
       # require refactoring cmd to take parameters
       %x(#{cmd_str})

data/lib/oxidized/input/ftp.rb

@@ -15,7 +15,7 @@ module Oxidized
     }.freeze
     include Input::CLI
 
-    def connect(node)
+    def connect(node) # rubocop:disable Naming/PredicateMethod
       @node = node
       @node.model.cfg['ftp'].each { |cb| instance_exec(&cb) }
       @log = File.open(Oxidized::Config::LOG + "/#{@node.ip}-ftp", 'w') if Oxidized.config.input.debug?
@@ -30,7 +30,7 @@ module Oxidized
     end
 
     def cmd(file)
-      Oxidized.logger.debug "FTP: #{file} @ #{@node.name}"
+      logger.debug "FTP: #{file} @ #{@node.name}"
       @ftp.getbinaryfile file, nil
     end
 

data/lib/oxidized/input/http.rb

@@ -51,7 +51,7 @@ module Oxidized
       schema = @secure ? "https://" : "http://"
       uri = URI("#{schema}#{@node.ip}#{path}")
 
-      Oxidized.logger.debug "Making request to: #{uri}"
+      logger.debug "Making request to: #{uri}"
 
       ssl_verify = Oxidized.config.input.http.ssl_verify? ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
 
@@ -59,17 +59,17 @@ module Oxidized
 
       if res.code == '401' && res['www-authenticate']&.include?('Digest')
         uri.user = @username
-        uri.password = @password
-        Oxidized.logger.debug "Server requires Digest authentication"
+        uri.password = URI.encode_www_form_component(@password)
+        logger.debug "Server requires Digest authentication"
         auth = Net::HTTP::DigestAuth.new.auth_header(uri, res['www-authenticate'], 'GET')
 
         res = make_request(uri, ssl_verify, 'Authorization' => auth)
       elsif @username && @password
-        Oxidized.logger.debug "Falling back to Basic authentication"
+        logger.debug "Falling back to Basic authentication"
         res = make_request(uri, ssl_verify, 'Authorization' => basic_auth_header)
       end
 
-      Oxidized.logger.debug "Response code: #{res.code}"
+      logger.debug "Response code: #{res.code}"
       res.body
     end
 
@@ -77,7 +77,7 @@ module Oxidized
       Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == "https", verify_mode: ssl_verify) do |http|
         req = Net::HTTP::Get.new(uri)
         @headers.merge(extra_headers).each { |header, value| req.add_field(header, value) }
-        Oxidized.logger.debug "Sending request with headers: #{@headers.merge(extra_headers)}"
+        logger.debug "Sending request with headers: #{@headers.merge(extra_headers)}"
         http.request(req)
       end
     end

data/lib/oxidized/input/input.rb

@@ -2,6 +2,7 @@ module Oxidized
   class PromptUndetect < OxidizedError; end
 
   class Input
+    include SemanticLogger::Loggable
     include Oxidized::Config::Vars
 
     RESCUE_FAIL = {

data/lib/oxidized/input/scp.rb

@@ -16,7 +16,7 @@ module Oxidized
     }.freeze
     include Input::CLI
 
-    def connect(node)
+    def connect(node) # rubocop:disable Naming/PredicateMethod
       @node = node
       @node.model.cfg['scp'].each { |cb| instance_exec(&cb) }
       @log = File.open(Oxidized::Config::LOG + "/#{@node.ip}-scp", 'w') if Oxidized.config.input.debug?
@@ -29,7 +29,7 @@ module Oxidized
     end
 
     def cmd(file)
-      Oxidized.logger.debug "SCP: #{file} @ #{@node.name}"
+      logger.debug "SCP: #{file} @ #{@node.name}"
       @ssh.scp.download!(file)
     end
 

data/lib/oxidized/input/ssh.rb

@@ -16,7 +16,7 @@ module Oxidized
     include Input::CLI
     class NoShell < OxidizedError; end
 
-    def connect(node)
+    def connect(node) # rubocop:disable Naming/PredicateMethod
       @node        = node
       @output      = String.new('')
       @pty_options = { term: "vt100" }
@@ -24,10 +24,10 @@ module Oxidized
       if Oxidized.config.input.debug?
         logfile = Oxidized::Config::LOG + "/#{@node.ip}-ssh"
         @log = File.open(logfile, 'w')
-        Oxidized.logger.debug "lib/oxidized/input/ssh.rb: I/O Debuging to #{logfile}"
+        logger.debug "I/O Debuging to #{logfile}"
       end
 
-      Oxidized.logger.debug "lib/oxidized/input/ssh.rb: Connecting to #{@node.name}"
+      logger.debug "Connecting to #{@node.name}"
       @ssh = Net::SSH.start(@node.ip, @node.auth[:username], make_ssh_opts)
       unless @exec
         shell_open @ssh
@@ -45,9 +45,9 @@ module Oxidized
     end
 
     def cmd(cmd, expect = node.prompt)
-      Oxidized.logger.debug "lib/oxidized/input/ssh.rb #{cmd.dump} @ #{node.name} with expect: #{expect.inspect}"
+      logger.debug "Sending '#{cmd.dump}' @ #{node.name} with expect: #{expect.inspect}"
       if Oxidized.config.input.debug?
-        @log.puts "sent #{cmd.dump}"
+        @log.puts "sent cmd #{@exec ? cmd.dump : (cmd + newline).dump}"
         @log.flush
       end
       cmd_output = if @exec
@@ -60,6 +60,10 @@ module Oxidized
     end
 
     def send(data)
+      if Oxidized.config.input.debug?
+        @log.puts "sent data #{data.dump}"
+        @log.flush
+      end
       @ses.send_data data
     end
 
@@ -75,8 +79,11 @@ module Oxidized
       disconnect_cli
       # if disconnect does not disconnect us, give up after timeout
       Timeout.timeout(Oxidized.config.timeout) { @ssh.loop }
-    rescue Errno::ECONNRESET, Net::SSH::Disconnect, IOError
-      # These exceptions are intented and therefore not handled here
+    rescue Errno::ECONNRESET, Net::SSH::Disconnect, IOError => e
+      logger.debug 'The other side closed the connection while ' \
+                   "disconnecting, rasing #{e.class} with #{e.messages}"
+    rescue Timeout::Error
+      logger.debug "#{@node.name} timed out while disconnecting"
     ensure
       @log.close if Oxidized.config.input.debug?
       (@ssh.close rescue true) unless @ssh.closed?
@@ -110,7 +117,7 @@ module Oxidized
 
     def cmd_shell(cmd, expect_re)
       @output = String.new('')
-      @ses.send_data cmd + "\n"
+      @ses.send_data cmd + newline
       @ses.process
       expect expect_re if expect_re
       @output
@@ -118,7 +125,7 @@ module Oxidized
 
     def expect(*regexps)
       regexps = [regexps].flatten
-      Oxidized.logger.debug "lib/oxidized/input/ssh.rb: expecting #{regexps.inspect} at #{node.name}"
+      logger.debug "Expecting #{regexps.inspect} at #{node.name}"
       Timeout.timeout(Oxidized.config.timeout) do
         @ssh.loop(0.1) do
           sleep 0.1
@@ -145,7 +152,7 @@ module Oxidized
 
       auth_methods = vars(:auth_methods) || %w[none publickey password]
       ssh_opts[:auth_methods] = auth_methods
-      Oxidized.logger.debug "AUTH METHODS::#{auth_methods}"
+      logger.debug "AUTH METHODS::#{auth_methods}"
 
       ssh_opts[:proxy] = make_ssh_proxy_command(vars(:ssh_proxy), vars(:ssh_proxy_port), secure) if vars(:ssh_proxy)
 
@@ -155,10 +162,10 @@ module Oxidized
       ssh_opts[:host_key]   = vars(:ssh_host_key).split(/,\s*/)   if vars(:ssh_host_key)
       ssh_opts[:hmac]       = vars(:ssh_hmac).split(/,\s*/)       if vars(:ssh_hmac)
 
-      if Oxidized.config.input.debug?
-        ssh_opts[:logger]  = Oxidized.logger
-        ssh_opts[:verbose] = Logger::DEBUG
-      end
+      # Use our logger for Net:SSH
+      ssh_logger = SemanticLogger[Net::SSH]
+      ssh_logger.level = Oxidized.config.input.debug? ? :debug : :error
+      ssh_opts[:logger] = ssh_logger
 
       ssh_opts
     end

data/lib/oxidized/input/telnet.rb

@@ -6,7 +6,7 @@ module Oxidized
     include Input::CLI
     attr_reader :telnet
 
-    def connect(node)
+    def connect(node) # rubocop:disable Naming/PredicateMethod
       @node    = node
       @timeout = Oxidized.config.timeout
       @node.model.cfg['telnet'].each { |cb| instance_exec(&cb) }
@@ -35,7 +35,7 @@ module Oxidized
     end
 
     def cmd(cmd_str, expect = @node.prompt)
-      Oxidized.logger.debug "Telnet: #{cmd_str} @#{@node.name}"
+      logger.debug "Telnet: #{cmd_str} @#{@node.name}"
       return send(cmd_str + "\r\n") unless expect
 
       # create a string to be passed to oxidized_expect and modified _there_
@@ -78,7 +78,7 @@ module Net
     ## FIXME: we also need output (not sure I'm going to support this)
     attr_reader :output
 
-    def oxidized_expect(options) ## rubocop:disable Metrics/PerceivedComplexity
+    def oxidized_expect(options)
       model    = @options["Model"]
       @log     = @options["Log"]
 

data/lib/oxidized/input/tftp.rb

@@ -21,7 +21,7 @@ module Oxidized
     end
 
     def cmd(file)
-      Oxidized.logger.debug "TFTP: #{file} @ #{@node.name}"
+      logger.debug "TFTP: #{file} @ #{@node.name}"
       config = StringIO.new
       @tftp.getbinary file, config
       config.rewind

data/lib/oxidized/job.rb

@@ -1,16 +1,19 @@
 module Oxidized
   class Job < Thread
+    include SemanticLogger::Loggable
+
     attr_reader :start, :end, :status, :time, :node, :config
 
     def initialize(node)
-      @node         = node
-      @start        = Time.now.utc
+      @node = node
+      @start = Time.now.utc
+      self.name = "Oxidized::Job '#{@node.name}'"
       super do
-        Oxidized.logger.debug "lib/oxidized/job.rb: Starting fetching process for #{@node.name} at #{Time.now.utc}"
+        logger.debug "Starting fetching process for #{@node.name} at #{Time.now.utc}"
         @status, @config = @node.run
         @end             = Time.now.utc
         @time            = @end - @start
-        Oxidized.logger.debug "lib/oxidized/job.rb: Config fetched for #{@node.name} at #{@end}"
+        logger.debug "Config fetched for #{@node.name} at #{@end}"
       end
     end
   end

data/lib/oxidized/logger.rb

@@ -0,0 +1,51 @@
+require 'semantic_logger'
+
+module Oxidized
+  module Logger
+    include SemanticLogger::Loggable
+
+    def self.setup
+      config = Oxidized.config
+      FileUtils.mkdir_p(Config::LOG) unless File.directory?(Config::LOG)
+
+      SemanticLogger.add_signal_handler
+
+      if config.use_syslog?
+        SemanticLogger.add_appender(appender: :syslog)
+        logger.warn("The configuration 'use_syslog' is deprecated. " \
+                    "Remove it and use 'logger' instead")
+      elsif config.log?
+        SemanticLogger.add_appender(file_name: File.expand_path(config.log))
+        logger.warn("The configuration 'log' is deprecated. " \
+                    "Remove it and use 'logger' instead")
+      elsif config.logger?
+        SemanticLogger.default_level = config.logger.level if config.logger.level?
+        config.logger.appenders.each { |a| add_appender a } if config.logger.has_key?('appenders')
+      end
+
+      # No appenders configured
+      SemanticLogger.add_appender(io: $stderr) if SemanticLogger.appenders.empty?
+
+      return if %i[trace debug].include?(SemanticLogger.default_level)
+
+      SemanticLogger.default_level = :debug if config.debug?
+    end
+
+    def self.add_appender(appender)
+      case appender['type']
+      when 'file'
+        params = { file_name: File.expand_path(appender['file']) }
+      when 'stderr'
+        params = { io: $stderr }
+      when 'stdout'
+        params = { io: $stdout }
+      when 'syslog'
+        params = { appender: :syslog, application: "oxidized" }
+      else
+        raise InvalidConfig, "Unknown logger #{appender['type']}, edit #{Oxidized::Config.configfile}"
+      end
+      params[:level] = appender['level'] if appender.has_key?('level')
+      SemanticLogger.add_appender(**params)
+    end
+  end
+end

data/lib/oxidized/model/acos.rb

@@ -20,6 +20,7 @@ class ACOS < Oxidized::Model
     cfg.gsub! /\s(Memory).*/, ' \\1 <removed>'
     cfg.gsub! /\s(Current time is).*/, ' \\1 <removed>'
     cfg.gsub! /\s(The system has been up).*/, ' \\1 <removed>'
+    cfg.gsub! /\s(Hardware: \d+ CPUs\(Stepping \d+\). Single \d+G drive. Free storage is).*/, ' \\1 <removed>'
     comment cfg
   end
 

data/lib/oxidized/model/aos7.rb

@@ -26,14 +26,23 @@ class AOS7 < Oxidized::Model
   end
 
   cmd 'show hardware-info' do |cfg|
+    # Remove extra lines occuring when the command runs slow
+    cfg.gsub! /^Please wait...\n/, ''
+    cfg.gsub! /^\n\n\n/, "\n\n"
     comment cfg
   end
 
   cmd 'show running-directory' do |cfg|
+    # Remove extra lines occuring when the command runs slow
+    cfg.gsub! /^Please wait...\n/, ''
+    cfg.gsub! /^\n\n/, "\n"
     comment cfg
   end
 
   cmd 'show configuration snapshot' do |cfg|
+    # Remove extra lines occuring when the command runs slow
+    cfg.gsub! /^Please wait...\n/, ''
+    cfg.gsub! /^\n\n/, "\n"
     cfg
   end
 

data/lib/oxidized/model/aoscx.rb

@@ -58,6 +58,8 @@ class Aoscx < Oxidized::Model
     cfg.gsub! /^(\d\/\d\/\d.*\s+)\d+\s+$/, '\\1<hidden>'
     cfg.gsub! /^(\d+\/?\S+\s+\S+\s+)\d+\.\d+\s+C\s+(.*)/, '\\1<hidden>   \\2'
     cfg.gsub! /^(LC.*\s+)\d+\.\d+\s+(C.*)$/, '\\1 <hidden> \\2'
+    # match show environment No speed shown for switches CX83xx, e.g. "PSU-1/1/1      N/A      N/A            N/A     front-to-back  ok      7360"
+    cfg.gsub! /^PSU(\S+\s+\S+\s+\s+\S+\s+)(slow|normal|medium|fast|max|N\/A)\s+(\S+\s+\S+\s+)\d+[[:blank:]]+/, '\\1<speed> \\3<rpm>'
     cfg.gsub! /^(\S+\s+\S+\s+\s+\S+\s+)(slow|normal|medium|fast|max)\s+(\S+\s+\S+\s+)\d+[[:blank:]]+/, '\\1<speed> \\3<rpm>'
     # match show environment power-consumption on VSF or standadlone, non-chassis and non-6400 switch, e.g. "2    6300M 48G 4SFP56 Swch                 156.00      155.94"
     cfg.gsub! /^(\d+\s+.+\s+)(\s{2}\d{2}\.\d{2}|\s{1}\d{3}\.\d{2}|\d{4}\.\d{2})(\s+)(\s{2}\d{2}\.\d{2}|\s{1}\d{3}\.\d{2}|\d{4}\.\d{2})$/, '\\1<power>\\3<power>'

data/lib/oxidized/model/aosw.rb

@@ -25,24 +25,25 @@ class AOSW < Oxidized::Model
   end
 
   cmd :secret do |cfg|
-    cfg.gsub!(/secret (\S+)$/, 'secret <secret removed>')
-    cfg.gsub!(/enable secret (\S+)$/, 'enable secret <secret removed>')
-    cfg.gsub!(/PRE-SHARE (\S+)$/, 'PRE-SHARE <secret removed>')
-    cfg.gsub!(/ipsec (\S+)$/, 'ipsec <secret removed>')
-    cfg.gsub!(/community (\S+)$/, 'community <secret removed>')
+    cfg.gsub!(/secret (\S+)\s?$/, 'secret <secret removed>')
+    cfg.gsub!(/enable secret (\S+)\s?$/, 'enable secret <secret removed>')
+    cfg.gsub!(/PRE-SHARE (\S+)\s?$/, 'PRE-SHARE <secret removed>')
+    cfg.gsub!(/ipsec (\S+)\s?$/, 'ipsec <secret removed>')
+    cfg.gsub!(/community (\S+)\s?$/, 'community <secret removed>')
     cfg.gsub!(/ sha (\S+)/, ' sha <secret removed>')
     cfg.gsub!(/ des (\S+)/, ' des <secret removed>')
     cfg.gsub!(/mobility-manager (\S+) user (\S+) (\S+)/, 'mobility-manager \1 user \2 <secret removed>')
-    cfg.gsub!(/mgmt-user (\S+) (root|guest-provisioning|network-operations|read-only|location-api-mgmt) (\S+)$/, 'mgmt-user \1 \2 <secret removed>') # MAS & Wireless Controler
-    cfg.gsub!(/mgmt-user (\S+) (\S+)( (read-only|guest-mgmt))?$/, 'mgmt-user \1 <secret removed> \3') # IAP
+    cfg.gsub!(/mgmt-user (\S+) (root|guest-provisioning|network-operations|read-only|location-api-mgmt) (\S+)\s?$/, 'mgmt-user \1 \2 <secret removed>') # MAS & Wireless Controler
+    cfg.gsub!(/mgmt-user (\S+) (\S+)( (read-only|guest-mgmt))?\s?$/, 'mgmt-user \1 <secret removed> \3') # IAP
     # MAS format: mgmt-user <username> <accesslevel> <password hash>
     # IAP format (root user): mgmt-user <username> <password hash>
     # IAP format: mgmt-user <username> <password hash> <access level>
-    cfg.gsub!(/key (\S+)$/, 'key <secret removed>')
-    cfg.gsub!(/wpa-passphrase (\S+)$/, 'wpa-passphrase <secret removed>')
-    cfg.gsub!(/bkup-passwords (\S+)$/, 'bkup-passwords <secret removed>')
-    cfg.gsub!(/user (\S+) (\S+) (\S+)$/, 'user \1 <secret removed> \3')
-    cfg.gsub!(/virtual-controller-key (\S+)$/, 'virtual-controller-key <secret removed>')
+    cfg.gsub!(/key (\S+)\s?$/, 'key <secret removed>')
+    cfg.gsub!(/vrrp-passphrase (\S+)\s?$/, 'vrrp-passphrase <secret removed>')
+    cfg.gsub!(/wpa-passphrase (\S+)\s?$/, 'wpa-passphrase <secret removed>')
+    cfg.gsub!(/bkup-passwords (\S+)\s?$/, 'bkup-passwords <secret removed>')
+    cfg.gsub!(/ap-console-password (\S+)\s?$/, 'ap-console-password <secret removed>')
+    cfg.gsub!(/virtual-controller-key (\S+)\s?$/, 'virtual-controller-key <secret removed>')
     cfg
   end
 
@@ -52,22 +53,26 @@ class AOSW < Oxidized::Model
   end
 
   cmd 'show inventory' do |cfg|
-    cfg = "" if cfg =~ /(Invalid input detected at '\^' marker|Parse error)/ # Don't show for unsupported devices (IAP and MAS)
+    # Don't show for unsupported devices (IAP and MAS)
+    cfg = "" if cfg =~ /(Invalid input detected at '\^' marker|Parse error)/
     rstrip_cfg clean cfg
   end
 
   cmd 'show slots' do |cfg|
-    cfg = "" if cfg =~ /(Invalid input detected at '\^' marker|Parse error)/ # Don't show for unsupported devices (IAP and MAS)
+    # Don't show for unsupported devices (IAP and MAS)
+    cfg = "" if cfg =~ /(Invalid input detected at '\^' marker|Parse error)/
     rstrip_cfg comment cfg
   end
 
   cmd 'show license' do |cfg|
-    cfg = "" if cfg =~ /(Invalid input detected at '\^' marker|Parse error)/ # Don't show for unsupported devices (IAP and MAS)
+    # Don't show for unsupported devices (IAP and MAS)
+    cfg = "" if cfg =~ /(Invalid input detected at '\^' marker|Parse error)/
     rstrip_cfg comment cfg
   end
 
   cmd 'show license passphrase' do |cfg|
-    cfg = "" if cfg.match /(Invalid input detected at '\^' marker|Parse error)/ # Don't show for unsupported devices (IAP and MAS)
+    # Don't show for unsupported devices (IAP and MAS)
+    cfg = "" if cfg.match /(Invalid input detected at '\^' marker|Parse error)/
     rstrip_cfg comment cfg
   end
 
@@ -117,7 +122,7 @@ class AOSW < Oxidized::Model
       next if line =~ /Output \d Config/i
       next if line =~ /(Tachometers|Temperatures|Voltages)/
       next if line =~ /((Card|CPU) Temperature|Chassis Fan|VMON1[0-9])/
-      next if line =~ /[0-9]+\s+(RPMS?|m?V|C|W)/i
+      next if line =~ /[0-9.]{1,6}\s+(RPMS?|m?V|C|W)/i
 
       out << line.strip
     end

data/lib/oxidized/model/aricentiss.rb

@@ -37,7 +37,7 @@ class AricentISS < Oxidized::Model
   cmd 'show system information' do |cfg|
     cfg.sub! /^Device Up Time.*\n/, ''
     cfg.delete! "\r"
-    comment(cfg).gsub(/ +$/, '')
+    comment(cfg).rstrip
   end
 
   cmd 'show running-config' do |cfg|
@@ -53,6 +53,6 @@ class AricentISS < Oxidized::Model
       end
 
       l
-    end.join.gsub(/ +$/, '')
+    end.join.rstrip
   end
 end

data/lib/oxidized/model/asa.rb

@@ -16,8 +16,7 @@ class ASA < Oxidized::Model
     cfg.gsub! /^passwd (\S+) (.*)/, 'passwd <secret hidden> \2'
     cfg.gsub! /username (\S+) password (\S+) (.*)/, 'username \1 password <secret hidden> \3'
     cfg.gsub! /(ikev[12] ((remote|local)-authentication )?pre-shared-key( hex)?) (\S+)/, '\1 <secret hidden>'
-    cfg.gsub! /^(aaa-server TACACS\+? \(\S+\) host[^\n]*\n(\s+[^\n]+\n)*\skey) \S+$/mi, '\1 <secret hidden>'
-    cfg.gsub! /^(aaa-server \S+ \(\S+\) host[^\n]*\n(\s+[^\n]+\n)*\s+key) \S+$/mi, '\1 <secret hidden>'
+    cfg.gsub! /^(aaa-server \S+(?: \(\S+\))? host \S+\n(?: [^\n]+\n)* +key) \S+$/mi, '\1 <secret hidden>'
     cfg.gsub! /ldap-login-password (\S+)/, 'ldap-login-password <secret hidden>'
     cfg.gsub! /^snmp-server host (.*) community (\S+)/, 'snmp-server host \1 community <secret hidden>'
     cfg.gsub! /^(failover key) .+/, '\1 <secret hidden>'
@@ -97,7 +96,8 @@ class ASA < Oxidized::Model
         contexts = systemcfg.scan(/^context (\S+)$/)
         files = systemcfg.scan(/config-url (\S+)$/)
         contexts.each_with_index do |cont, i|
-          allcfg = allcfg + "\n\n----------========== [ CONTEXT " + cont.join(" ") + " FILE " + files[i].join(" ") + " ] ==========----------\n\n"
+          allcfg = allcfg + "\n\n----------========== [ CONTEXT " + cont.join(" ") +
+                   " FILE " + files[i].join(" ") + " ] ==========----------\n\n"
           cmd "more " + files[i].join(" ") do |cfgcontext|
             allcfg = allcfg + "\n\n" + cfgcontext
           end

data/lib/oxidized/model/awplus.rb

@@ -61,25 +61,28 @@ class AWPlus < Oxidized::Model
     cfg
   end
 
-  # Config required for telnet to detect username prompt
+  # Config required for telnet to detect username & password prompt.
   cfg :telnet do
     username /login:\s/
+    password /^Password:\s/
   end
 
-  # Main login config
+  # Config required for ssh to specify newline characters.
   cfg :telnet, :ssh do
+    newline "\r\n"
+
     post_login do
-      if vars :enable
-        send "enable\n"
-        expect /^Password:\s/
-        cmd vars(:enable) + "\r\n"
-      else
-        cmd 'enable' # Required for Priv-Exec users without enable PW to be put into "enable mode".
+      if vars(:enable) == true
+        cmd "enable"
+      elsif vars(:enable)
+        cmd "enable", /^[pP]assword:/
+        cmd vars(:enable)
       end
-      #      cmd 'terminal length 0' #set so the entire config is output without intervention.
+      # cmd 'terminal length 0' # set so the entire config is output without intervention.
     end
+
     pre_logout do
-      #      cmd 'terminal no length' #Sets term length back to default on exit.
+      # cmd 'terminal no length' # sets term length back to default on exit.
       send "exit\r\n"
     end
   end