oxidized 0.14.3 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17df74ebc75870bfaf11cfdc157960c70ad9cc8d
-  data.tar.gz: 71b84e576ce86002f55493d916e4f80c76ef82ec
+  metadata.gz: a5dd4172e3c9577bfb601bc1d88378abf9540179
+  data.tar.gz: 57dcd79de9f7303ad54031a33b51579d6f33882a
 SHA512:
-  metadata.gz: 6c1b08bb7139195973cc2e98190989aac3469c763dbd53a1ceb92510fa582ccdb6beb261383541ee26e589a68e5e285eb5ab94d305b4d92099f8b22a2b965513
-  data.tar.gz: 39e7b8e08e86699a1f5ef2ee24511c00b613fac5e056e685244928b463a759e8d8ee6d265557c8db457b0872f51432b44090c8b75139a0be31c6985bc1e7c7ca
+  metadata.gz: 41682a4c5ff7978340c21e7255ffdc1b9fe25615db8977b0bd027045fa9849bb4be6edd401b7e6776e54be497714188b3d3ec1d74909a596a1d945945cc1c6c0
+  data.tar.gz: e63697ab95faad315a36b6bfb6e0be416aaae3a4c7d2433f371f85914b0ec658ab13bf7ecd58723774902984c1204885dfaa2e82fea6e829c93bd5a46e038360

data/.ruby-version

@@ -0,0 +1 @@
+2.1.8

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 0.15.0
+- FEATURE: disable periodic collection, only on demand (by Adam Winberg)
+- FEATURE: allow disabling ssh exec mode always (mainly for oxidized-script) (by @nickhilliard)
+- FEATURE: support mellanox devices (by @ham5ter)
+- FEATURE: support firewireos devices (by @alexandre-io)
+- FEATURE: support quanta devices (by @f0o)
+- FEATURE: support tellabs coriant8800, coriant8600 (by @udhos)
+- FEATURE: support brocade6910 (by @cardboardpig)
+- BUGFIX: debugging, tests (by @ElvinEfendi)
+- BUGFIX: nos, panos, acos, procurve, eos, edgeswitch, aosw, fortios updates
+
 # 0.14.3
 - BUGFIX: fix git when using multiple groups without single_repo
 

data/Dockerfile

@@ -13,3 +13,6 @@ RUN apt-get -y autoremove
 
 ADD extra/oxidized.runit /etc/service/oxidized/run
 ADD extra/auto-reload-config.runit /etc/service/auto-reload-config/run
+
+VOLUME ["/root/.config/oxidized"]
+EXPOSE 8888/tcp

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    oxidized (0.12.2)
+    oxidized (0.14.3)
       asetus (~> 0.1)
-      net-ssh (~> 3.0, >= 3.0.2)
+      net-ssh (>= 3.0.0, < 3.1)
       rugged (~> 0.21, >= 0.21.4)
       slop (~> 3.5)
 
@@ -23,7 +23,7 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rake (10.4.2)
-    rugged (0.23.3)
+    rugged (0.24.0)
     slop (3.6.0)
 
 PLATFORMS
@@ -38,4 +38,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.11.2
+   1.12.4

data/README.md

@@ -20,13 +20,14 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
 1. [Supported OS Types](#supported-os-types)
 2. [Installation](#installation)
     * [Debian](#debian)
-    * [CentOS, Oracle Linux, Red Hat Linux version 6](#centos-oracle-linux-red-hat-linux-version 6)
+    * [CentOS, Oracle Linux, Red Hat Linux](#centos-oracle-linux-red-hat-linux)
 3. [Initial Configuration](#configuration)
 4. [Installing Ruby 2.1.2 using RVM](#installing-ruby-2.1.2-using-rvm)
 5. [Running with Docker](#running-with-docker)
 6. [Cookbook](#cookbook)
     * [Debugging](#debugging)
     * [Privileged mode](#privileged-mode)
+    * [Disabling SSH exec channels](#disabling-ssh-exec-channels)
     * [Source: CSV](#source-csv)
     * [Source: SQLite](#source-sqlite)
     * [Source: HTTP](#source-http)
@@ -62,6 +63,7 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
    * Ironware
    * NOS (Network Operating System)
    * Vyatta
+   * 6910
  * Ciena
    * SOAS
  * Cisco
@@ -74,6 +76,9 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
    * SMB (Nikola series)
  * Citrix
    * NetScaler (Virtual Applicance)
+ * Coriant (former Tellabs)
+   * TMOS (8800)
+   * 8600
  * Cumulus
    * Linux
  * DataCom
@@ -101,6 +106,8 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
  * Juniper
    * JunOS
    * ScreenOS (Netscreen)
+ * Mellanox
+   * MLNX-OS
  * Mikrotik
    * RouterOS
  * Motorola
@@ -113,12 +120,16 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
    * Opengear
  * Palo Alto
    * PANOS
+ * Quanta
+   * Quanta / VxWorks 6.6 (1.1.0.8)
  * Supermicro
    * Supermicro
  * Ubiquiti
    * AirOS
    * Edgeos
    * EdgeSwitch
+ * Watchguard
+   * Fireware OS
  * Zyxel
    * ZyNOS
 
@@ -133,13 +144,19 @@ gem install oxidized
 gem install oxidized-script oxidized-web # if you don't install oxidized-web, make sure you remove "rest" from your config
 ```
 
-## CentOS, Oracle Linux, Red Hat Linux version 6
-Install Ruby 1.9.3 or greater (for Ruby 2.1.2 installation instructions see "Installing Ruby 2.1.2 using RVM"), then install Oxidized dependencies
+## CentOS, Oracle Linux, Red Hat Linux
+On CentOS 6 / RHEL 6, install Ruby 1.9.3 or greater (for Ruby 2.1.2 installation instructions see "Installing Ruby 2.1.2 using RVM"), then install Oxidized dependencies
 ```shell
 yum install cmake sqlite-devel openssl-devel libssh2-devel
 ```
 
-Now lets install oxidized via Rubygems:
+RHEL 7 / CentOS 7 will work out of the box with the following package list:
+
+```shell
+yum install cmake sqlite-devel openssl-devel libssh2-devel ruby gcc ruby-devel
+```
+
+Now let's install oxidized via Rubygems:
 ```shell
 gem install oxidized
 gem install oxidized-script oxidized-web
@@ -149,6 +166,14 @@ gem install oxidized-script oxidized-web
 
 Oxidized configuration is in YAML format. Configuration files are subsequently sourced from ```/etc/oxidized/config``` then ```~/.config/oxidized/config```. The hashes will be merged, this might be useful for storing source information in a system wide file and  user specific configuration in the home directory (to only include a staff specific username and password). Eg. if many users are using ```oxs```, see [Oxidized::Script](https://github.com/ytti/oxidized-script).
 
+It is recommended practice to run Oxidized using its own username.  This username can be added using standard command-line tools:
+
+```
+useradd oxidized
+```
+
+It is recommended not to run Oxidized as root.
+
 To initialize a default configuration in your home directory ```~/.config/oxidized/config```, simply run ```oxidized``` once. If you don't further configure anything from the output and source sections, it'll extend the examples on a subsequent ```oxidized``` execution. This is useful to see what options for a specific source or output backend are available.
 
 You can set the env variable `OXIDIZED_HOME` to change its home directory.
@@ -316,6 +341,16 @@ The above strips out snmp community strings from your saved configs.
 
 **NOTE:** Removing secrets reduces the usefulness as a full configuration backup, but it may make sharing configs easier.
 
+### Disabling SSH exec channels
+
+Oxidized uses exec channels to make information extraction simpler, but there are some situations where this doesn't work well, e.g. configuring devices.  This feature can be turned off by setting the ```ssh_no_exec```
+variable.
+
+```
+vars:
+  ssh_no_exec: true
+```
+
 ### Source: CSV
 
 One line per device, colon seperated.
@@ -551,6 +586,7 @@ vars:
   enable: S3cr3tx
 groups: {}
 rest: 127.0.0.1:8888
+pid: ~/.config/oxidized/oxidized.pid
 input:
   default: ssh, telnet
   debug: false

data/extra/oxidized.service

@@ -6,7 +6,7 @@ Description=Oxidized - Network Device Configuration Backup Tool
 
 [Service]
 ExecStart=/usr/local/bin/oxidized
-User=root
+User=oxidized
 
 [Install]
 WantedBy=multi-user.target

data/lib/oxidized/cli.rb

@@ -24,7 +24,7 @@ module Oxidized
       Config.load(@opts)
       Oxidized.setup_logger
 
-      @pidfile = File.join(Oxidized::Config::Root, 'pid')
+      @pidfile = File.expand_path(Oxidized.config.pid)
     end
 
     def crash error

data/lib/oxidized/config.rb

@@ -30,6 +30,7 @@ module Oxidized
       asetus.default.rest          = '127.0.0.1:8888' # or false to disable
       asetus.default.vars          = {}             # could be 'enable'=>'enablePW'
       asetus.default.groups        = {}             # group level configuration
+      asetus.default.pid           = File.join(Oxidized::Config::Root, 'pid')
 
       asetus.default.input.default    = 'ssh, telnet'
       asetus.default.input.debug      = false # or String for session log file

data/lib/oxidized/core.rb

@@ -31,6 +31,7 @@ module Oxidized
     private
 
     def run
+      Oxidized.logger.debug "lib/oxidized/core.rb: Starting the worker..."
       while true
         @worker.work
         sleep Config::Sleep

data/lib/oxidized/input/cli.rb

@@ -17,10 +17,15 @@ module Oxidized
       end
 
       def connect_cli
-        @post_login.each { |command, block| block ? block.call : (cmd command) }
+        Oxidized.logger.debug "lib/oxidized/input/cli.rb: 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}"
+          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}"
         @pre_logout.each { |command, block| block ? block.call : (cmd command, nil) }
       end
 

data/lib/oxidized/input/ssh.rb

@@ -37,6 +37,7 @@ module Oxidized
       ssh_opts[:kex] = vars(:ssh_kex).split(/,\s*/) if vars(:ssh_kex)
       ssh_opts[:encryption] = vars(:ssh_encryption).split(/,\s*/) if vars(:ssh_encryption)
 
+      Oxidized.logger.debug "lib/oxidized/input/ssh.rb: Connecting to #{@node.name}"
       @ssh = Net::SSH.start(@node.ip, @node.auth[:username], ssh_opts)
       unless @exec
         shell_open @ssh
@@ -54,7 +55,7 @@ module Oxidized
     end
 
     def cmd cmd, expect=node.prompt
-      Oxidized.logger.debug "SSH: #{cmd} @ #{node.name}"
+      Oxidized.logger.debug "lib/oxidized/input/ssh.rb #{cmd} @ #{node.name} with expect: #{expect.inspect}"
       if @exec
         @ssh.exec! cmd
       else
@@ -111,7 +112,7 @@ module Oxidized
     end
 
     def exec state=nil
-      state == nil ? @exec : (@exec=state)
+      state == nil ? @exec : (@exec=state) unless vars :ssh_no_exec
     end
 
     def cmd_shell(cmd, expect_re)
@@ -123,6 +124,7 @@ module Oxidized
     end
 
     def expect regexp
+      Oxidized.logger.debug "lib/oxidized/input/ssh.rb: expecting #{regexp.inspect} at #{node.name}"
       Timeout::timeout(Oxidized.config.timeout) do
         @ssh.loop(0.1) do
           sleep 0.1
@@ -130,6 +132,5 @@ module Oxidized
         end
       end
     end
-
   end
 end

data/lib/oxidized/job.rb

@@ -5,9 +5,11 @@ module Oxidized
       @node         = node
       @start        = Time.now.utc
       super do
+        Oxidized.logger.debug "lib/oxidized/job.rb: 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}"
       end
     end
   end

data/lib/oxidized/jobs.rb

@@ -6,7 +6,9 @@ module Oxidized
 
     def initialize max, interval, nodes
       @max       = max
-      @interval  = interval
+      # Set interval to 1 if interval is 0 (=disabled) so we don't break 
+      # the 'ceil' function
+      @interval  = interval == 0 ? 1 : interval
       @nodes     = nodes
       @last      = Time.now.utc
       @durations = Array.new @nodes.size, AVERAGE_DURATION

data/lib/oxidized/model/acos.rb

@@ -7,6 +7,14 @@ class ACOS < Oxidized::Model
   prompt /^([-\w.\/:?\[\]\(\)]+[#>]\s?)$/
 
   cmd 'show version' do |cfg|
+    cfg.gsub! /\s(Last configuration saved at).*/, ' \\1 <removed>'
+    cfg.gsub! /\s(Memory).*/, ' \\1 <removed>'
+    cfg.gsub! /\s(Current time is).*/, ' \\1 <removed>'
+    cfg.gsub! /\s(The system has been up).*/, ' \\1 <removed>'
+    comment cfg
+  end
+
+  cmd 'show bootimage' do |cfg|
     comment cfg
   end
 
@@ -14,7 +22,12 @@ class ACOS < Oxidized::Model
     comment cfg
   end
 
-  cmd 'show running-config all-partitions'
+  cmd 'show running-config all-partitions' do |cfg|
+     cfg.gsub! /(Current configuration).*/, '\\1 <removed>'
+     cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
+     cfg.gsub! /(Configuration last saved at).*/, '\\1 <removed>'
+     cfg.gsub! /(Configuration last synchronized at).*/, '\\1 <removed>'
+  end
 
   cmd 'show aflex all-partitions' do |cfg|
     comment cfg

data/lib/oxidized/model/aosw.rb

@@ -22,6 +22,7 @@ class AOSW < Oxidized::Model
     cfg.gsub!(/key (\S+)$/, 'key <secret removed>')
     cfg.gsub!(/secret (\S+)$/, 'secret <secret removed>')
     cfg.gsub!(/wpa-passphrase (\S+)$/, 'wpa-passphrase <secret removed>')
+    cfg.gsub!(/bkup-passwords (\S+)$/, 'bkup-passwords <secret removed>')
     cfg
   end
 

data/lib/oxidized/model/asa.rb

@@ -33,18 +33,17 @@ class ASA < Oxidized::Model
     # backup any xml referenced in the configuration.
     anyconnect_profiles = cfg.scan(Regexp.new('(\sdisk0:/.+\.xml)')).flatten
     anyconnect_profiles.each do |profile|
-	cfg << (comment profile + "\n" )
-    	cmd ("more" + profile) do |xml|
-	  cfg << (comment xml)
-	end
+  	  cfg << (comment profile + "\n" )
+   	  cmd ("more" + profile) do |xml|
+	      cfg << (comment xml)
+	    end
     end
     # if DAP is enabled, also backup dap.xml
     if cfg.rindex(/dynamic-access-policy-record\s(?!DfltAccessPolicy)/)
-   	cfg << (comment "disk0:/dap.xml\n")
-        cmd "more disk0:/dap.xml" do |xml|
-          cfg << (comment xml)
-	  puts xml
-        end
+   	  cfg << (comment "disk0:/dap.xml\n")
+      cmd "more disk0:/dap.xml" do |xml|
+        cfg << (comment xml)
+      end
     end
     cfg
   end
@@ -53,7 +52,7 @@ class ASA < Oxidized::Model
     if vars :enable
       post_login do
         send "enable\n"
-        send vars(:enable) + "\n"
+        cmd vars(:enable)
       end
     end
     post_login 'terminal pager 0'

data/lib/oxidized/model/br6910.rb

@@ -0,0 +1,45 @@
+
+class BR6910 < Oxidized::Model
+
+  prompt /^Vty-[0-9]\#$/
+  comment  '! '
+
+  # not possible to disable paging prior to show running-config
+  expect /^((.*)Others to exit ---(.*))$/ do |data, re|
+    send 'a'
+    data.sub re, ''
+  end
+
+  cmd :all do |cfg|
+    # sometimes br6910s inserts arbitrary whitespace after commands are
+    # issued on the CLI, from run to run.  this normalises the output.
+    cfg.each_line.to_a[1..-2].drop_while { |e| e.match /^\s+$/ }.join
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  # show flash is not possible on a brocade 6910, do dir instead 
+  # to see flash contents (includes config file names)
+  cmd 'dir' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    arr = cfg.each_line.to_a
+    arr[2..-1].join unless arr.length < 2
+  end
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  # post login and post logout 
+  cfg :telnet, :ssh do
+    post_login ''
+    pre_logout 'exit'
+  end
+
+end

data/lib/oxidized/model/coriant8600.rb

@@ -0,0 +1,30 @@
+class Coriant8600 < Oxidized::Model
+
+  comment '# '
+  
+  prompt /^[^\s#>]+[#>]$/
+
+  cmd 'show hw-inventory' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show flash' do |cfg|
+    comment cfg
+  end
+  
+  cmd 'show run' do |cfg|
+    cfg
+  end
+
+  cfg :telnet do
+    username /^user name:$/
+    password /^password:$/
+  end
+  
+  cfg :telnet, :ssh do
+    pre_logout 'exit'
+    post_login 'enable'
+    post_login 'terminal more off'
+  end
+
+end

data/lib/oxidized/model/corianttmos.rb

@@ -0,0 +1,25 @@
+class CoriantTmos < Oxidized::Model
+
+  comment '# '
+  
+  prompt /^[^\s#]+#\s$/
+
+  cmd 'show node extensive' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show run' do |cfg|
+    cfg
+  end
+
+  cfg :telnet do
+    username /^Login:\s$/
+    password /^Password:\s$/
+  end
+
+  cfg :telnet, :ssh do
+    pre_logout 'exit'
+    post_login 'enable config terminal length 0'
+  end
+  
+end

data/lib/oxidized/model/edgeswitch.rb

@@ -11,8 +11,8 @@ class EdgeSwitch < Oxidized::Model
   end
 
   cfg :telnet do
-    username /Username:\s/
-    password /^Password:\s/
+    username /User(name)?:\s?/
+    password /^Password:\s?/
   end
 
   cfg :telnet, :ssh do

data/lib/oxidized/model/eos.rb

@@ -14,6 +14,7 @@ class EOS < Oxidized::Model
      cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
      cfg.gsub! /username (\S+) privilege (\d+) (\S+).*/, '<secret hidden>'
      cfg.gsub! /^(enable secret).*/, '\\1 <configuration removed>'
+     cfg.gsub! /^(tacacs-server key \d+).*/, '\\1 <configuration removed>'
      cfg
   end
 

data/lib/oxidized/model/firewareos.rb

@@ -0,0 +1,24 @@
+class FirewareOS < Oxidized::Model
+
+  prompt /^\[?\w*\]?\w*<?\w*>?#\s*$/
+  comment  '-- '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd 'show sysinfo' do |cfg|
+    # avoid commits due to uptime
+    cfg = cfg.each_line.select { |line| not line.match /(.*time.*)|(.*memory.*)|(.*cpu.*)/ }
+    cfg = cfg.join
+    comment cfg
+  end
+
+  cmd 'export config to console'
+
+  cfg :ssh do
+    pre_logout 'exit'
+  end
+
+end
+

data/lib/oxidized/model/fortios.rb

@@ -2,7 +2,7 @@ class FortiOS < Oxidized::Model
 
   comment  '# '
 
-  prompt /^([-\w\.]+(\s[\(\w\-\.\)]+)?\~?\s?[#>$]\s?)$/
+  prompt /^([-\w\.\~]+(\s[\(\w\-\.\)]+)?\~?\s?[#>$]\s?)$/
 
   expect /^--More--\s$/ do |data, re|
     send ' '

data/lib/oxidized/model/junos.rb

@@ -7,8 +7,7 @@ class JunOS < Oxidized::Model
   end
 
   cmd :all do |cfg|
-    # we don't need screen-scraping in ssh due to exec
-    cfg = cfg.lines.to_a[1..-2].join if telnet
+    cfg = cfg.lines.to_a[1..-2].join if screenscrape
     cfg.lines.map { |line| line.rstrip }.join("\n") + "\n"
   end
 

data/lib/oxidized/model/mlnxos.rb

@@ -0,0 +1,43 @@
+class MLNXOS < Oxidized::Model
+
+  prompt /([\w.@()-\[:\s\]]+[#>]\s)$/
+  comment  '## '
+  
+  # Pager Handling
+  expect /.+lines\s\d+\-\d+([\s]|\/\d+\s\(END\)\s).+$/ do |data, re|
+    send ' '
+    data.sub re, ''
+  end
+
+  cmd :all do |cfg|
+    cfg.gsub! /\[\?1h=\r/, '' # Pager Handling
+    cfg.gsub! /\r\[K/,'' # Pager Handling
+    cfg.gsub! /\s/, '' # Linebreak Handling
+    cfg = cfg.lines.to_a[2..-3].join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /(snmp-server community).*/, '   <snmp-server community configuration removed>'
+    cfg.gsub! /username (\S+) password (\d+) (\S+).*/, '<secret hidden>'
+    cfg
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show inventory' do |cfg|
+    comment cfg
+  end
+
+  cmd 'enable'
+
+  cmd 'show running-config' do |cfg|
+    cfg
+  end
+
+  cfg :ssh do
+    password /^Password:\s*/
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/model.rb

@@ -35,6 +35,7 @@ module Oxidized
         else
           @cmd[:cmd] << [_cmd, block]
         end
+        Oxidized.logger.debug "lib/oxidized/model/model.rb Added #{_cmd} to the commands list"
       end
       def cmds
         @cmd
@@ -79,6 +80,7 @@ module Oxidized
     attr_accessor :input, :node
 
     def cmd string, &block
+      Oxidized.logger.debug "lib/oxidized/model/model.rb Executing #{string}"
       out = @input.cmd(string)
       return false unless out
       self.class.cmds[:all].each do |all_block|
@@ -127,6 +129,7 @@ module Oxidized
     end
 
     def get
+      Oxidized.logger.debug 'lib/oxidized/model/model.rb Collecting commands\' outputs'
       outputs = Outputs.new
       procs = self.class.procs
       self.class.cmds[:cmd].each do |command, block|
@@ -151,6 +154,10 @@ module Oxidized
       data
     end
 
+    def screenscrape
+      @input.class.to_s.match(/Telnet/) || vars(:ssh_no_exec)
+    end
+
     private
 
     def process_cmd_output output, name

data/lib/oxidized/model/nos.rb

@@ -22,14 +22,14 @@ class NOS < Oxidized::Model
   end
 
   cmd 'show chassis' do |cfg|
-    comment cfg.each_line.reject { |line| line.match /Time/ }.join
+    comment cfg.each_line.reject { |line| line.match /Time/ or line.match /Update/ }.join
   end
 
   cfg 'show system' do |cfg|
     comment cfg.each_line.reject { |line| line.match /Time/ or line.match /speed/ }
   end
 
-  cmd 'show running-config'
+  cmd 'show running-config | nomore'
 
   cfg :telnet do
     username /^.* login: /

data/lib/oxidized/model/panos.rb

@@ -11,7 +11,14 @@ class PanOS < Oxidized::Model
   end
 
   cmd 'show system info' do |cfg|
-    cfg.gsub! /^(up)?time:\ .*\n/, ''
+    cfg.gsub! /^(up)?time:\ .*$/, ''
+    cfg.gsub! /^app-.*?:\ .*$/, ''
+    cfg.gsub! /^av-.*?:\ .*$/, ''
+    cfg.gsub! /^threat-.*?:\ .*$/, ''
+    cfg.gsub! /^wildfire-.*?:\ .*$/, ''
+    cfg.gsub! /^wf-private.*?:\ .*$/, ''
+    cfg.gsub! /^url-filtering.*?:\ .*$/, ''
+    cfg.gsub! /^global-.*?:\ .*$/, ''
     comment cfg
   end
 

data/lib/oxidized/model/procurve.rb

@@ -40,7 +40,8 @@ class Procurve < Oxidized::Model
 
   # not supported on all models
   cmd 'show system information' do |cfg|
-    cfg = cfg.split("\n")[0..-8].join("\n")
+    cfg = cfg.each_line.select { |line| not line.match /(.*CPU.*)|(.*Up Time.*)|(.*Total.*)|(.*Free.*)|(.*Lowest.*)|(.*Missed.*)/ }
+    cfg = cfg.join
     comment cfg
   end
 

data/lib/oxidized/model/quantaos.rb

@@ -0,0 +1,35 @@
+class QuantaOS < Oxidized::Model
+
+  prompt /^\((\w|\S)+\) (>|#)$/
+  comment '! '
+  
+  cmd 'show run' do |cfg|
+    cfg.each_line.select do |line|
+      not line.match /^!.*$/ and
+      not line.match /^\((\w|\S)+\) (>|#)$/ and
+      not line.match /^show run$/
+    end.join
+  end
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login do
+      send "enable\n"
+      if vars :enable
+        cmd vars(:enable)
+      else
+        cmd ""
+      end
+    end
+    post_login 'terminal length 0'
+    pre_logout do
+      send "quit\n"
+      send "n\n"
+    end
+  end
+
+end

data/lib/oxidized/node.rb

@@ -9,9 +9,7 @@ module Oxidized
     attr_accessor :running, :user, :msg, :from, :stats, :retry
     alias :running? :running
     def initialize opt
-      if Oxidized.config.debug == true or opt[:debug] == true
-        puts 'resolving DNS for %s...' % opt[:name]
-      end
+      Oxidized.logger.debug 'resolving DNS for %s...' % opt[:name]
       @name           = opt[:name]
       @ip             = IPAddr.new(opt[:ip]).to_s rescue nil
       @ip           ||= Resolv.new.getaddress @name
@@ -38,9 +36,11 @@ module Oxidized
         next unless @model.cfg[cfg_name] and not @model.cfg[cfg_name].empty?
         @model.input = input = input.new
         if config=run_input(input)
+          Oxidized.logger.debug "lib/oxidized/node.rb: #{input.class.name} ran for #{name} successfully"
           status = :success
           break
         else
+          Oxidized.logger.debug "lib/oxidized/node.rb: #{input.class.name} failed for #{name}"
           status = :no_connection
         end
       end
@@ -165,6 +165,7 @@ module Oxidized
     def resolve_model opt
       model = (opt[:model] or Oxidized.config.model)
       if not Oxidized.mgr.model[model]
+        Oxidized.logger.debug "lib/oxidized/node.rb: Loading model #{model.inspect}"
         Oxidized.mgr.add_model model or raise ModelNotFound, "#{model} not found for node #{ip}"
       end
       Oxidized.mgr.model[model].new

data/lib/oxidized/nodes.rb

@@ -11,6 +11,7 @@ module Oxidized
         new = []
         @source = Oxidized.config.source.default
         Oxidized.mgr.add_source @source
+        Oxidized.logger.info "lib/oxidized/nodes.rb: Loading nodes"
         Oxidized.mgr.source[@source].new.load.each do |node|
           # we want to load specific node(s), not all of them
           next unless node_want? node_want, node
@@ -24,7 +25,7 @@ module Oxidized
           end
         end
         size == 0 ? replace(new) : update_nodes(new)
-        Oxidized.logger.info "Loaded #{size} nodes"
+        Oxidized.logger.info "lib/oxidized/nodes.rb: Loaded #{size} nodes"
       end
     end
 

data/lib/oxidized/version.rb

@@ -1,3 +1,3 @@
 module Oxidized
-  VERSION = '0.14.3'
+  VERSION = '0.15.0'
 end

data/lib/oxidized/worker.rb

@@ -14,17 +14,21 @@ module Oxidized
       ended.each      { |job| process job }
       @jobs.work
       while @jobs.size < @jobs.want
-        Oxidized.logger.debug "Jobs #{@jobs.size}, Want: #{@jobs.want}"
+        Oxidized.logger.debug "lib/oxidized/worker.rb: Jobs #{@jobs.size}, Want: #{@jobs.want}"
         # ask for next node in queue non destructive way
         nextnode = @nodes.first
         unless nextnode.last.nil?
-          break if nextnode.last.end + Oxidized.config.interval > Time.now.utc
+          # Set unobtainable value for 'last' if interval checking is disabled
+          last = Oxidized.config.interval == 0 ? Time.now.utc + 10 : nextnode.last.end
+          break if last + Oxidized.config.interval > Time.now.utc
         end
         # shift nodes and get the next node
         node = @nodes.get
         node.running? ? next : node.running = true
         @jobs.push Job.new node
+        Oxidized.logger.debug "lib/oxidized/worker.rb: Added #{node.name} to the job queue"
       end
+      Oxidized.logger.debug("lib/oxidized/worker.rb: #{@jobs.size} jobs running in parallel") unless @jobs.empty?
     end
 
     def process job

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.15.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus
@@ -160,6 +160,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Dockerfile
@@ -206,10 +207,13 @@ files:
 - lib/oxidized/model/aos7.rb
 - lib/oxidized/model/aosw.rb
 - lib/oxidized/model/asa.rb
+- lib/oxidized/model/br6910.rb
 - lib/oxidized/model/c4cmts.rb
 - lib/oxidized/model/catos.rb
 - lib/oxidized/model/ciscosmb.rb
 - lib/oxidized/model/comware.rb
+- lib/oxidized/model/coriant8600.rb
+- lib/oxidized/model/corianttmos.rb
 - lib/oxidized/model/cumulus.rb
 - lib/oxidized/model/datacom.rb
 - lib/oxidized/model/dnos.rb
@@ -217,6 +221,7 @@ files:
 - lib/oxidized/model/edgeswitch.rb
 - lib/oxidized/model/eos.rb
 - lib/oxidized/model/fabricos.rb
+- lib/oxidized/model/firewareos.rb
 - lib/oxidized/model/fortios.rb
 - lib/oxidized/model/ftos.rb
 - lib/oxidized/model/ios.rb
@@ -226,6 +231,7 @@ files:
 - lib/oxidized/model/isam.rb
 - lib/oxidized/model/junos.rb
 - lib/oxidized/model/masteros.rb
+- lib/oxidized/model/mlnxos.rb
 - lib/oxidized/model/model.rb
 - lib/oxidized/model/mtrlrfs.rb
 - lib/oxidized/model/netonix.rb
@@ -237,6 +243,7 @@ files:
 - lib/oxidized/model/panos.rb
 - lib/oxidized/model/powerconnect.rb
 - lib/oxidized/model/procurve.rb
+- lib/oxidized/model/quantaos.rb
 - lib/oxidized/model/routeros.rb
 - lib/oxidized/model/saos.rb
 - lib/oxidized/model/screenos.rb