oxidized 0.29.1 → 0.37.0

data/lib/oxidized/model/smartbyte.rb

@@ -0,0 +1,48 @@
+class SmartByte < Oxidized::Model
+  using Refinements
+
+  comment '! '
+
+  cmd :secret do |cfg|
+    cfg.gsub!(/group (\S+) v2c/, 'group <hidden> v2c')
+    cfg.gsub!(/community (\S+)/, 'community <hidden>')
+    cfg
+  end
+
+  cmd :all do |cfg|
+    cfg = cfg.delete("\r")
+    cfg.cut_tail
+  end
+
+  cmd 'show running-config'
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show interface optical-transceiver info' do |cfg|
+    cfg.gsub! /^\|Transceiver current alarm information:           \|\s+\+-------------------------------------------------\+.*?\s+\+-------------------------------------------------\+\s+/m, ''
+    comment cfg
+  end
+
+  cmd 'show power' do |cfg|
+    comment cfg
+  end
+
+  cfg :telnet do
+    username /^.*? login:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login do
+      if vars(:enable)
+        cmd "enable", /^[pP]assword:/
+        cmd vars(:enable)
+      end
+    end
+
+    post_login 'terminal length 0'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/sonicos.rb

@@ -3,28 +3,35 @@ class SonicOS < Oxidized::Model
 
   # Applies to Sonicwall NSA series firewalls
 
-  prompt /^\w+@\w+[>]\(?.+\)?\s?/
-  comment  '! '
+  prompt /^\w+@[\w-]+>\(?.+\)?\s?/
+  comment '! '
+
+  # Accept policiy message (see Issue #3339). Tested on 6.5 and 7.1
+  expect /Accept The Policy Banner \(yes\)\?\r\nyes: $/ do |data, re|
+    send "yes\n"
+    data.sub re, ''
+  end
 
   cmd :all do |cfg|
     cfg.each_line.to_a[1..-2].join
   end
 
   cmd :secret do |cfg|
-    cfg.gsub! /cli ftp password default \d\,(\S+)/, 'cli ftp password default <secret hidden> \2'
-    cfg.gsub! /secret \d\,(\S+)/, 'secret <secret hidden> \2'
-    cfg.gsub! /shared-secret \d\,(\S+)/, 'shared-secret <secret hidden> \2'
-    cfg.gsub! /password \d\,(\S+)/, 'password <secret hidden> \2'
-    cfg.gsub! /passphrase password \d\,(\S+)/, 'passphrase password <secret hidden> \2'
-    cfg.gsub! /bind-password \d\,(\S+)/, 'bind-password <secret hidden> \2'
-    cfg.gsub! /authentication sha1 \d\,(\S+)/, 'authentication sha1 <secret hidden> \2'
-    cfg.gsub! /encryption aes \d\,(\S+)/, 'encryption aes <secret hidden> \2'
-    cfg.gsub! /smtp-pass \d\,(\S+)/, 'smtp-pass <secret hidden> \2'
-    cfg.gsub! /pop-pass \d\,(\S+)/, 'pop-pass <secret hidden> \2'
-    cfg.gsub! /sslvpn password \d\,(\S+)/, 'sslvpn password <secret hidden> \2'
-    cfg.gsub! /administrator password \d\,(\S+)/, 'administrator password <secret hidden> \2'
-    cfg.gsub! /ftp password \d\,(\S+)/, 'ftp password <secret hidden> \2'
-    cfg.gsub! /shared-key \d\,(\S+)/, 'shared-key <secret hidden> \2'
+    cfg.gsub! /cli ftp password default \d,(\S+)/, 'cli ftp password default <secret hidden> \2'
+    cfg.gsub! /secret \d,(\S+)/, 'secret <secret hidden> \2'
+    cfg.gsub! /shared-secret \d,(\S+)/, 'shared-secret <secret hidden> \2'
+    cfg.gsub! /password \d,(\S+)/, 'password <secret hidden> \2'
+    cfg.gsub! /passphrase password \d,(\S+)/, 'passphrase password <secret hidden> \2'
+    cfg.gsub! /bind-password \d,(\S+)/, 'bind-password <secret hidden> \2'
+    cfg.gsub! /authentication sha1 \d,(\S+)/, 'authentication sha1 <secret hidden> \2'
+    cfg.gsub! /encryption aes \d,(\S+)/, 'encryption aes <secret hidden> \2'
+    cfg.gsub! /smtp-pass \d,(\S+)/, 'smtp-pass <secret hidden> \2'
+    cfg.gsub! /pop-pass \d,(\S+)/, 'pop-pass <secret hidden> \2'
+    cfg.gsub! /sslvpn password \d,(\S+)/, 'sslvpn password <secret hidden> \2'
+    cfg.gsub! /administrator password \d,(\S+)/, 'administrator password <secret hidden> \2'
+    cfg.gsub! /ftp password \d,(\S+)/, 'ftp password <secret hidden> \2'
+    cfg.gsub! /shared-key \d,(\S+)/, 'shared-key <secret hidden> \2'
+    cfg.gsub! /wpa passphrase \d,(\S+)/, 'wpa passphrase <secret hidden> \2'
     cfg
   end
 
@@ -46,10 +53,10 @@ class SonicOS < Oxidized::Model
   def clean(cfg)
     out = []
     cfg.each_line do |line|
-      next if line =~ /date \d{4}\:\d{2}\:\d{2}/
-      next if line =~ /time \d{2}\:\d{2}:\d{2}/
-      next if line =~ /system-time \"\d{2}\/\d{2}\/\d{4} \d{2}\:\d{2}:\d{2}.\d+\"/
-      next if line =~ /system-uptime "((\s+up\s+\d+\s+)|(\d+\s\w+(,\s)?)*)"/
+      next if line =~ /date \d{4}:\d{2}:\d{2}/
+      next if line =~ /time \d{2}:\d{2}:\d{2}/
+      next if line =~ /system-time "\d{2}\/\d{2}\/\d{4} \d{2}:\d{2}:\d{2}.\d+"/
+      next if line =~ /system-uptime "(?:\s+up\s+\d+\s+|\d+ \w+(?:, \d+ \w+)*)"/
       next if line =~ /checksum \d+/
 
       line = line[1..-1] if line[0] == "\r"

data/lib/oxidized/model/speedtouch.rb

@@ -1,7 +1,7 @@
 class SpeedTouch < Oxidized::Model
   using Refinements
 
-  prompt /([\w{}=]+[>])$/
+  prompt /([\w{}=]+>)$/
   comment '! '
 
   expect /login$/ do

data/lib/oxidized/model/sros.rb

@@ -32,7 +32,7 @@ class SROS < Oxidized::Model
     #
     # Strip uptime.
     #
-    cfg.sub! /^System Up Time.*\n/, ''
+    cfg.gsub! /^System Up Time.*$/, ''
     comment cfg
   end
 
@@ -75,14 +75,14 @@ class SROS < Oxidized::Model
   #
   # Show the running persistent indices.
   #
-  cmd 'admin display-config index' do |cfg|
+  cmd "admin display-config index\n" do |cfg|
     comment cfg
   end
 
   #
   # Show the running configuration.
   #
-  cmd 'admin display-config' do |cfg|
+  cmd "admin display-config\n" do |cfg|
     cfg
   end
 

data/lib/oxidized/model/srosmd.rb

@@ -26,7 +26,7 @@ class SROSMD < Oxidized::Model
     #
     # Strip uptime.
     #
-    cfg.sub! /^System Up Time.*\n/, ''
+    cfg.gsub! /^System Up Time.*\n/, ''
     comment cfg
   end
 

data/lib/oxidized/model/supermicro.rb

@@ -5,6 +5,6 @@ require_relative 'edgecos'
 
 Supermicro = EdgeCOS
 
-Oxidized.logger.warn "Using deprecated model supermicro, use edgecos instead."
+logger.warn "Using deprecated model supermicro, use edgecos instead."
 
 # Deprecated

data/lib/oxidized/model/telco.rb

@@ -3,7 +3,7 @@ class TELCO < Oxidized::Model
 
   # Telco Systems T-Marc 3306
 
-  prompt /^(\r?[\w.@_()-]+[#]\s?)$/
+  prompt /^(\r?[\w.@_()-]+\#\s?)$/
   comment '! '
 
   cmd :all do |cfg|

data/lib/oxidized/model/tmos.rb

@@ -32,6 +32,7 @@ class TMOS < Oxidized::Model
     cfg.gsub!(/^\s+bandwidth-bps (\d+)/, '')
     cfg.gsub!(/^\s+bandwidth-cps (\d+)/, '')
     cfg.gsub!(/^\s+bandwidth-pps (\d+)\n/, '')
+    cfg.gsub!(/^\s*\S*encrypted \S+\n/, '')
     cfg
   end
 

data/lib/oxidized/model/tnsr.rb

@@ -0,0 +1,57 @@
+class TNSR < Oxidized::Model
+  using Refinements
+
+  # Netgate TNSR #
+
+  # prompt examples
+  # https://docs.netgate.com/tnsr/en/latest/basics/working-cli.html#command-prompt
+  #  "<hostname> tnsr<(mode)># " <-- with trailing whitespace
+  #  tnsr-dev-25-02 tnsr#
+  #  tnsr-dev-25-02 tnsr(config)#  <-- after "configure terminal", but this is not important for oxidized
+  # prompt from debug log
+  #  received "Welcome to Netgate TNSR Version: 25.02-2\r\n\r\n\t* Documentation:  https://docs.netgate.com/tnsr/en/latest/\r\n\t* Support:        https://www.netgate.com/support\r\n\r\n   _          __________\r\n _| |_ _ __  | ___ _ __ |\r\n|_  __| '_ \\ |/ __| '__||\r\n  | |_| | | ||\\__ \\ |   |\r\n   \\__|_| |_|||___/_|   |\r\n             |__________|\r\n\r\n\r\n"
+  #  received "\r\nVersion: 25.02-2\r\n\r\nFor information see 'show documentation'\r\n\r\n"
+  #  received "\rbgp01 tnsr# "
+  # when the --More-- pager is the last line of paged output, the prompt contains \x08\x20\x08 orphans on the begin
+  # on older version (23.06) --More-- pager is sometimes misplaced
+  #  you can look for context into spec simulation:
+  #    spec/model/data/tnsr#TNSR_24.10-3_short-config#simulation.yaml
+  #    spec/model/data/tnsr#TNSR_25.02-2_long-config-and-pager-at-last-line#simulation.yaml
+  #    spec/model/data/tnsr#TNSR_23.06-3_with-misplaced-pager#simulation.yaml
+  prompt /^((\x08{8}\x20{8}\x08{8})?\r?[\w-]+\stnsr#\s?)$/
+
+  comment '! '
+
+  expect /^--More--|--More--$/ do |data, re|
+    send ' '
+    data.sub re, ''
+  end
+
+  cmd :all do |cfg|
+    # remove orphans \r
+    cfg.gsub! /^\r+(.+)/, '\1'
+    # handle pager orphans ^H^H^H^H^H^H^H^H        ^H^H^H^H^H^H^H^H
+    cfg.gsub! /\x08{8}\x20{8}\x08{8}/, ''
+    cfg.cut_both
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /(password( \d+)?) (\S+).*/, '\\1 <secret hidden>'
+    cfg.gsub! /^(snmp community community-name )\S+ (.*)?/, '\\1 <configuration removed> \\2'
+    cfg
+  end
+
+  cmd 'show version all' do |cfg|
+    # for older tnsr versions
+    cfg = cmd('show version') if cfg.to_s =~ /^CLI syntax error:.+Unknown command$/
+    comment cfg
+  end
+
+  cmd 'show configuration running cli' do |cfg|
+    cfg
+  end
+
+  cfg :telnet, :ssh do
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/tplink.rb

@@ -48,17 +48,17 @@ class TPLink < Oxidized::Model
     lines[0..lines.index("end\n")].join
   end
 
+  macro :enable, regex: /^[pP]assword:/
+
   cfg :telnet, :ssh do
     username /^User ?[nN]ame:/
     password /^\r?Password:/
+    newline "\r\n"
   end
 
   cfg :telnet, :ssh do
-    if vars :enable
-      post_login do
-        send "enable\r"
-        cmd vars(:enable)
-      end
+    post_login do
+      cmd 'terminal length 0'
     end
 
     pre_logout do

data/lib/oxidized/model/trango.rb

@@ -14,11 +14,13 @@ class Trango < Oxidized::Model
         out << ("opmode " + Regexp.last_match[1])
         out << ("defaultopmode " + Regexp.last_match[2])
       end
-      out << ("power " + Regexp.last_match[1]) if line =~ /\[Tx Power\] ([\-\d]+) dBm/
+      out << ("power " + Regexp.last_match[1]) if line =~ /\[Tx Power\] ([-\d]+) dBm/
       out << ("freq " + Regexp.last_match[1] + ' ' + Regexp.last_match[2]) if line =~ /\[Active Channel\] (\d+) (v|h)/
       out << ("peerid " + Regexp.last_match[1]) if line =~ /\[Peer ID\] ([A-F0-9]+)/
       out << ("utype " + Regexp.last_match[1]) if line =~ /\[Unit Type\] (\S+)/
-      comments << ('# ' + Regexp.last_match[1] + ': ' + Regexp.last_match[2]) if line =~ /\[(Hardware Version|Firmware Version|Model|S\/N)\] (\S+)/
+      if line =~ /\[(Hardware Version|Firmware Version|Model|S\/N)\] (\S+)/
+        comments << ('# ' + Regexp.last_match[1] + ': ' + Regexp.last_match[2])
+      end
       out << ("remarks " + Regexp.last_match[1]) if line =~ /\[Remarks\] (\S+)/
       out << ("rssiled " + Regexp.last_match[1]) if line =~ /\[RSSI LED\] (on|off)/
       speed = Regexp.last_match[1] if line =~ /\[Speed\] (\d+) Mbps/

data/lib/oxidized/model/truenas.rb

@@ -5,13 +5,74 @@ class TrueNAS < Oxidized::Model
 
   cmd('uname -a') { |cfg| comment cfg }
   cmd('cat /etc/version') { |cfg| comment cfg }
-  cmd('sqlite3 "file:///data/freenas-v1.db?mode=ro&immutable=1" .dump') do |cfg|
+
+  # for TrueNAS SCALE machines, make sure the user you use to connect can run
+  # this command, or if needed, with passwordless sudo. Try putting this in
+  # /etc/sudoers
+  #    oxidized ALL=(ALL) NOPASSWD: /usr/bin/find /mnt/.ix-apps/app_configs *, /usr/bin/sqlite3 -readonly file\:/data/freenas-v1.db *
+
+  cmd("sqlite3 -readonly 'file:/data/freenas-v1.db' .dump") do |cfg|
+    if cfg.include? "Error: unable to open database"
+      # retry with sudo
+      cfg = cmd("sudo sqlite3 -readonly 'file:/data/freenas-v1.db' .dump")
+    end
     cfg.lines.reject do |line|
-      line.match(/^INSERT INTO storage_replication /) ||
-        line.match(/^INSERT INTO system_alert /)
+      line.match(/^INSERT INTO storage_replication /) || # ignore storage_replication because repl_status field changes on every run
+        line.match(/^INSERT INTO system_alert /) || # ignore system alerts in db
+        line.match(/^INSERT INTO sqlite_sequence VALUES\('system_alert',/) || # ignore system alerts in db
+        line.match(/^INSERT INTO tasks_cloudsync /) # ignore cloudsync tasks because job field changes on every run
     end.join
   end
 
+  post do
+    filter_column("storage_replication", "repl_state")
+  end
+
+  post do
+    filter_column("tasks_cloudsync", "job")
+  end
+
+  post do
+    collect_ixapps_configurations
+  end
+
+  def filter_column(table_name, column_name)
+    sqlite_cmd = "sqlite3 -readonly 'file:/data/freenas-v1.db'"
+
+    # This SQL command will create a SELECT query with all columns except the one we want to skip.
+    generate_select_cmd = "select 'select ' || group_concat(name,', ') || ' FROM #{table_name};' FROM pragma_table_info('#{table_name}') WHERE name != '#{column_name}';"
+
+    select_stmt = cmd("#{sqlite_cmd} \"#{generate_select_cmd}\"")
+    if select_stmt.include? "Error: unable to open database"
+      # retry with sudo
+      sqlite_cmd = "sudo #{sqlite_cmd}"
+      select_stmt = cmd("#{sqlite_cmd} \"#{generate_select_cmd}\"")
+    end
+
+    insert_cmds = "-header '.mode insert #{table_name}' '#{select_stmt}'"
+    cmd("#{sqlite_cmd} #{insert_cmds}") do |cfg|
+      if cfg.include? "INSERT"
+        # Don't add a COMMIT; if the query came up with no rows
+        cfg + "COMMIT;\n"
+      end
+    end
+  end
+
+  def collect_ixapps_configurations
+    config_command = <<~'CMDEND'
+      if [ -d /mnt/.ix-apps ];
+      then
+        sudo find /mnt/.ix-apps/app_configs
+        \( -name "app.yaml" -or -name "user_config.yaml" -or -name "metadata.yaml" \)
+        -printf "\n\n#######################\n# %p\n#######################\n"
+        -exec cat {} \; ;
+      else
+        echo "# No Apps configuration found in /mnt/.ix-apps";
+      fi
+    CMDEND
+    cmd(config_command.gsub("\n", ""))
+  end
+
   cfg :ssh do
     exec true # don't run shell, run each command in exec channel
   end

data/lib/oxidized/model/ucs.rb

@@ -1,7 +1,7 @@
 class UCS < Oxidized::Model
   using Refinements
 
-  prompt /^(\r?[\w.@_()-]+[#]\s?)$/
+  prompt /^(\r?[\w.@_()-]+\#\s?)$/
   comment '! '
 
   cmd 'show version brief' do |cfg|

data/lib/oxidized/model/unifiap.rb

@@ -0,0 +1,144 @@
+class Unifiap < Oxidized::Model
+  using Refinements
+
+  # Ubiquiti Unifi AP circa 6.x
+  # Should also work for unfi switches, and airOS, maybe they could be combined.
+  # Since it relies on exec channels, because the interactive session wouldn't
+  # capture all of the system.cfg output, you can't use telnet with this model.
+
+  # Sometimes there's a handy info command that summarizes some device attributes,
+  # but it doesn't seem to be available in exec mode. So we try to build up a similar
+  # list by extracting tidbits from various places. AirOS doesn't have some of these
+  # files, so we  # may have to fall back on other commands, or locations.
+
+  # First get the board model
+  cmd 'head -4 /etc/board.info' do |cfg|
+    @model = Regexp.last_match(1) if cfg =~ /board\.name=(\S+)/i
+    ""
+  end
+
+  # and version
+  cmd 'cat /etc/version' do |cfg|
+    @version = Regexp.last_match(1) if cfg =~ /(\S+)$/i
+    ""
+  end
+
+  # Now the Mac address
+  cmd 'ifconfig eth0' do |cfg|
+    @mac = Regexp.last_match(1) if cfg =~ /eth0\s+Link encap:Ethernet\s+HWaddr\s+(\w+:\w+:\w+:\w+:\w+:\w+)/i
+    ""
+  end
+
+  # Next see if we can get our IP and host name out of /etc/hosts
+  cmd 'cat /etc/hosts' do |cfg|
+    cfg = cfg.split("\n").reject do |line|
+      line[/^\s*(127|0000:0000:0000:0000:0000:0000:0000:0001|0:0:0:0:0:0:0:1|::1)/]
+    end
+    cfg.select do |line|
+      if (match = line.match(/(\d+\.\d+\.\d+\.\d+)\s+(\S+)/))
+        @ip, @hostname = match.captures
+      end
+    end
+    ""
+  end
+
+  # We check here to see if we succeeded with /etc/hosts. If not, then we try again with ifconfig, and /tmp/system.cfg
+  cmd 'echo' do
+    unless @ip
+      cmd 'ifconfig br0' do |cfg|
+        @ip = Regexp.last_match(1) if cfg =~ /inet addr:\s*(\d+\.\d+\.\d+\.\d+)/i
+      end
+
+      unless @ip
+        cmd 'ifconfig eth0' do |cfg|
+          @ip = Regexp.last_match(1) if cfg =~ /inet addr:\s*(\d+\.\d+\.\d+\.\d+)/i
+        end
+      end
+    end
+
+    unless @hostname
+      cmd 'cat /tmp/system.cfg' do |cfg|
+        @hostname = Regexp.last_match(1) if cfg =~ /resolv.host.1.name=(\S+)/i
+      end
+    end
+    ""
+  end
+
+  # Check if ntpclient is running
+  cmd 'ps wwww' do |cfg|
+    @ntpserver = Regexp.last_match(1) if cfg =~ /bin\/ntpclient.+-h\s*(\S+)/i
+    ""
+  end
+
+  # If it's a Unifi device it may have NTP health indication
+  # If there are other places that Ubiquiti puts these status files, add them here.
+  cmd '[ -e /tmp/run/ntp.ready ] || [ -e /var/run/ntp.ready ] && echo "File(s) exist(s)" || echo "No such file"' do |cfg|
+    if cfg =~ /No such file/i
+      if @ntpserver
+        # Ok, now lets try getting the skew from the output of ntpclient
+        cmd "ntpclient -d -n -c 2 -i0 -h #{@ntpserver}" do |ntp_out|
+          @skew = ntpskew(ntp_out)
+        end
+        @sync = !@skew.nil? && @skew.to_f.abs < 1e6 ? "Synchronized" : "FAIL"
+      end
+    else
+      @ntpserver = true
+      @sync = "Synchronized"
+    end
+    ""
+  end
+
+  # Now we can display it all as a banner
+  cmd 'echo' do
+    out = []
+    out << "*************************"
+    out << "Model:       #{@model}"
+    out << "Version:     #{@version}"
+    out << "MAC Address: #{@mac}"
+    out << "IP Address:  #{@ip}"
+    out << "Hostname:    #{@hostname}"
+    out << "NTP:         #{@sync}" if @ntpserver
+    out << "*************************"
+    comment out.join("\n") + "\n"
+  end
+
+  # Followed by the board info
+  cmd 'cat /etc/board.info' do |cfg|
+    cfg = "#\n# Board Info:\n#\n" + cfg
+    comment cfg
+  end
+
+  # Lastly the system config
+  cmd 'cat /tmp/system.cfg' do |cfg|
+    cfg = "#\n# System Config:\n#\n" + cfg
+    cfg + "\n"
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^((?:users|snmp\.(?:user|community))\.\d+\.password)=.+/, "# \\1=<hidden>"
+    cfg
+  end
+
+  cfg :ssh do
+    exec true # Don't run shell, run each command in exec channel
+  end
+
+  # NTPskew: Return the skew in micro seconds from the ntpclient output
+  def ntpskew(cfg)
+    index = skew = nil
+
+    cfg.each_line do |line|
+      # Look for the header just before the stats line, and find which number is skew
+      if line.match(/^\s*[a-z]+\s+[a-z]+\s+[a-z]+\s+[a-z]+/i)
+        words = line.split
+        index = words.map(&:downcase).index("skew")
+      end
+      # Now look for the single stats line and grab the skew
+      if !index.nil? && line.match(/^\s*[\d.]+\s+[\d.]+\s+[\d.]+\s+[\d.]+/)
+        numbers = line.split
+        skew = numbers[index]
+      end
+    end
+    skew
+  end
+end

data/lib/oxidized/model/uplinkolt.rb

@@ -0,0 +1,46 @@
+class UPLINKOLT < Oxidized::Model
+  prompt /^([\w.@()-]+[#>]\s?)$/
+  comment  '! '
+
+  cmd :all do |cfg|
+    cfg.gsub! /^% Invalid input detected at '\^' marker\.$|^\s+\^$/, ''
+    cfg.gsub!(/^show running-config$/, '')
+    cfg.gsub!(/^.*\s*#\s*$/, '')
+    # Remove leading and trailing whitespace
+    cfg.strip!
+    # Remove empty lines
+    cfg.gsub!(/^\s*$/, '')
+    cfg
+  end
+
+  cmd 'configure terminal' do
+    # Enter configure terminal mode
+    cmd 'show version' do |cfg|
+      cfg.gsub! /^show version/, ''
+      comment cfg
+    end
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg.gsub! /^Current configuration:/, ''
+    cfg
+  end
+
+  cfg :telnet, :ssh do
+    username /^Login:/i
+    password /^Password:/i
+    # preferred way to handle additional passwords
+    post_login do
+      if vars(:enable) == true
+        cmd "enable"
+      elsif vars(:enable)
+        cmd "enable", /^[pP]assword:/
+        cmd vars(:enable)
+      end
+    end
+    post_login 'terminal length 0'
+    pre_logout 'exit'
+    pre_logout 'disable'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/voltaire.rb

@@ -5,7 +5,7 @@ class VOLTAIRE < Oxidized::Model
   comment '## '
 
   # Pager Handling
-  expect /.+lines\s\d+-\d+([\s]|\/\d+\s\(END\)\s).+$/ do |data, re|
+  expect /.+lines\s\d+-\d+(\s|\/\d+\s\(END\)\s).+$/ do |data, re|
     send ' '
     data.sub re, ''
   end

data/lib/oxidized/model/voss.rb

@@ -23,6 +23,9 @@ class Voss < Oxidized::Model
     cfg.gsub! /(^((.*)Last Vlan Change(.*):(.*))$)/, 'removed Last Vlan Change'
     cfg.gsub! /(^((.*)Temperature(.*):(.*))$)/, 'removed Temperature'
     cfg.gsub! /(^((.*)Total Power Usage(.*):(.*))$)/, 'removed Total Power Usage'
+    cfg.gsub! /(^((.*)(Tray \d+ Fan \d+)\s+(\w+)\s+(\w+)\s+(.*))$)/, '\3\4      \5      [removed RPM values]'
+    cfg.gsub! /(^((.*)Command Execution Time: (.*))$)/, 'Command Execution Time [removed]'
+    cfg.gsub! /(^((.*)(Ambient\s+\d+|CPU|INTERNAL\s+MAC|SODIMM)\s+\d+\s+\d+(.*))$)/, '\3\4  [removed temperature readings]'
     comment "#{cfg}\n"
   end
 

data/lib/oxidized/model/vrp.rb

@@ -27,15 +27,19 @@ class VRP < Oxidized::Model
   end
 
   cmd 'display version' do |cfg|
-    cfg = cfg.each_line.reject { |l| l.match /uptime/ }.join
+    cfg = cfg.each_line.reject do |l|
+      l.match /uptime|^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d(\.\d\d\d)? ?(\+\d\d:\d\d)?$/
+    end.join
     comment cfg
   end
 
   cmd 'display device' do |cfg|
+    cfg = cfg.each_line.reject { |l| l.match /^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d(\.\d\d\d)? ?(\+\d\d:\d\d)?$/ }.join
     comment cfg
   end
 
   cmd 'display current-configuration all' do |cfg|
+    cfg = cfg.each_line.reject { |l| l.match /^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d(\.\d\d\d)? ?(\+\d\d:\d\d)?$/ }.join
     cfg
   end
 end

data/lib/oxidized/model/vyatta.rb

@@ -1,9 +1,9 @@
 class Vyatta < Oxidized::Model
   using Refinements
 
-  # Brocade Vyatta / VyOS model #
+  # Brocade Vyatta model #
 
-  prompt /@.*?:~\$\s/
+  prompt /@.*(:~\$|>)\s/
 
   cmd :all do |cfg|
     cfg.lines.to_a[1..-2].join
@@ -14,10 +14,16 @@ class Vyatta < Oxidized::Model
     cfg.gsub! /plaintext-password (\S+).*/, 'plaintext-password <secret removed>'
     cfg.gsub! /password (\S+).*/, 'password <secret removed>'
     cfg.gsub! /pre-shared-secret (\S+).*/, 'pre-shared-secret <secret removed>'
-    cfg.gsub! /community (\S+) {/, 'community <hidden> {'
+    cfg.gsub! /community (\S+)/, 'community <hidden>'
+    cfg.gsub! /private-key (\S+).*/, 'private-key <secret removed>'
+    cfg.gsub! /preshared-key (\S+).*/, 'preshared-key <secret removed>'
     cfg
   end
 
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
   cmd 'show configuration commands | no-more'
 
   cfg :telnet do