oxidized 0.11.0 → 0.12.0

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 0.12.0
+- FEATURE: enhance AOSW (by @mikebryant)
+- FEATURE: F5 TMOS support (by @mikebryant)
+- FEATURE: Opengear support (by @mikebryant)
+- FEATURE: EdgeSwitch support (by @doogieconsulting)
+- BUGFIX: rename input debug log files
+- BUGFIX: powerconnect model fixes (by @Madpilot0)
+- BUGFIX: fortigate model fixes (by @ElvinEfendi) 
+- BUGFIX: various (by @mikebryant)
+- BUGFIX: write SSH debug to file without buffering
+- BUGFIX: fix IOS XR prompt handling
+
 # 0.11.0
 - FEATURE: ssh proxycommand (by @ElvinEfendi)
 - FEATURE: basic auth in HTTP source (by @laf)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oxidized (0.10.0)
+    oxidized (0.11.0)
       asetus (~> 0.1)
       net-ssh (~> 3.0, >= 3.0.2)
       rugged (~> 0.21, >= 0.21.4)

data/README.md

@@ -45,11 +45,11 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
  * A10 Networks
    * ACOS
  * Alcatel-Lucent
-   * ISAM
    * AOS
    * AOS7
-   * Wireless
+   * ISAM
    * TiMOS
+   * Wireless
  * Arista
    * EOS
  * Arris
@@ -77,10 +77,11 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
    * AOSW
  * Extreme Networks
    * XOS
- * Force10
-   * FTOS
+ * F5
+   * TMOS
  * Force10
    * DNOS
+   * FTOS
  * FortiGate
    * FortiOS
  * HP
@@ -95,11 +96,14 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
    * RouterOS
  * MRV
    * MasterOS
+ * Opengear
+   * Opengear
+ * Palo Alto
+   * PANOS
  * Ubiquiti
    * AirOS
    * Edgeos
- * Palo Alto
-   * PANOS
+   * EdgeSwitch
  * Zyxel
    * ZyNOS
 
@@ -218,7 +222,7 @@ rvm use --default 2.1.2
 ```
 6. run container again:
 ```
-    root@bla:~# docker run -v /etc/oxidized:/root/.config/oxidized -p 8888:8888/tcp -t oxidized/oxidized:latest oxidized
+    root@bla:~# docker run -v /etc/oxidized:/root/.config/oxidized -p 8888:8888/tcp -t oxidized/oxidized:latest
     oxidized[1]: Oxidized starting, running as pid 1
     oxidized[1]: Loaded 1 nodes
     Puma 2.13.4 starting...
@@ -232,7 +236,7 @@ rvm use --default 2.1.2
 
 If you want to have the config automatically reloaded (e.g. when using a http source that changes)
 ```
-    root@bla:~# docker run -v /etc/oxidized:/root/.config/oxidized -p 8888:8888/tcp -e CONFIG_RELOAD_INTERVAL=3600 -t oxidized/oxidized:latest oxidized
+    root@bla:~# docker run -v /etc/oxidized:/root/.config/oxidized -p 8888:8888/tcp -e CONFIG_RELOAD_INTERVAL=3600 -t oxidized/oxidized:latest
 ```
 
 ## Cookbook

data/lib/oxidized/config.rb

@@ -5,6 +5,7 @@ module Oxidized
   class Config
     Root      = File.join ENV['HOME'], '.config', 'oxidized'
     Crash     = File.join Root, 'crash'
+    Log       = File.join Root, 'log'
     InputDir  = File.join Directory, %w(lib oxidized input)
     OutputDir = File.join Directory, %w(lib oxidized output)
     ModelDir  = File.join Directory, %w(lib oxidized model)

data/lib/oxidized/input/ftp.rb

@@ -18,7 +18,7 @@ module Oxidized
     def connect node
       @node       = node
       @node.model.cfg['ftp'].each { |cb| instance_exec(&cb) }
-      @log = File.open(Oxidized::Config::Crash + "-#{@node.ip}-ftp", 'w') if Oxidized.config.input.debug?
+      @log = File.open(Oxidized::Config::Log + "-#{@node.ip}-ftp", 'w') if Oxidized.config.input.debug?
       @ftp = Net::FTP.new @node.ip, @node.auth[:username], @node.auth[:password]
       connected?
     end

data/lib/oxidized/input/ssh.rb

@@ -21,7 +21,7 @@ module Oxidized
       @output     = ''
       @node.model.cfg['ssh'].each { |cb| instance_exec(&cb) }
       secure = Oxidized.config.input.ssh.secure
-      @log = File.open(Oxidized::Config::Crash + "-#{@node.ip}-ssh", 'w') if Oxidized.config.input.debug?
+      @log = File.open(Oxidized::Config::Log + "-#{@node.ip}-ssh", 'w') if Oxidized.config.input.debug?
       port = vars(:ssh_port) || 22
       if proxy_host = vars(:proxy)
         proxy =  Net::SSH::Proxy::Command.new("ssh #{proxy_host} nc %h %p")
@@ -79,7 +79,10 @@ module Oxidized
     def shell_open ssh
       @ses = ssh.open_channel do |ch|
         ch.on_data do |_ch, data|
-          @log.print data if Oxidized.config.input.debug?
+          if Oxidized.config.input.debug?
+            @log.print data
+            @log.fsync
+          end
           @output << data
           @output = @node.model.expects @output
         end

data/lib/oxidized/input/telnet.rb

@@ -16,7 +16,7 @@ module Oxidized
               'Port'    => port.to_i,
               'Timeout' => @timeout,
               'Model'   => @node.model }
-      opt['Output_log'] = Oxidized::Config::Crash + "-#{@node.ip}-telnet" if Oxidized.config.input.debug?
+      opt['Output_log'] = Oxidized::Config::Log + "-#{@node.ip}-telnet" if Oxidized.config.input.debug?
 
       @telnet  = Net::Telnet.new opt
       if @node.auth[:username] and @node.auth[:username].length > 0

data/lib/oxidized/jobs.rb

@@ -20,13 +20,18 @@ module Oxidized
     end
 
     def duration last
+      if @durations.size > @nodes.size
+        @durations.slice! @nodes.size...@durations.size
+      elsif @durations.size < @nodes.size
+        @durations.fill AVERAGE_DURATION, @durations.size...@nodes.size
+      end
       @durations.push(last).shift
       @duration = @durations.inject(:+).to_f / @nodes.size #rolling average
       new_count
     end
 
     def new_count
-      @want = ((@nodes.size * @duration) / @interval).to_i
+      @want = ((@nodes.size * @duration) / @interval).ceil
       @want = 1 if @want < 1
       @want = @nodes.size if @want > @nodes.size
       @want = @max if @want > @max

data/lib/oxidized/model/aosw.rb

@@ -11,6 +11,20 @@ class AOSW < Oxidized::Model
     cfg.each_line.to_a[1..-2].join
   end
 
+  cmd :secret do |cfg|
+    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!(/ 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+) (\S+) (\S+)$/, 'mgmt-user \1 \2 <secret removed>')
+    cfg.gsub!(/key (\S+)$/, 'key <secret removed>')
+    cfg.gsub!(/secret (\S+)$/, 'secret <secret removed>')
+    cfg.gsub!(/wpa-passphrase (\S+)$/, 'wpa-passphrase <secret removed>')
+    cfg
+  end
+
   cmd 'show version' do |cfg|
     cfg = cfg.each_line.select { |line| not line.match /Switch uptime/i }
     comment cfg.join
@@ -26,8 +40,15 @@ class AOSW < Oxidized::Model
   cmd 'show license' do |cfg|
     comment cfg
   end
-  cmd 'show configuration' do |cfg|
-    cfg
+  cmd 'show running-config' do |cfg|
+    out = []
+    cfg.each_line do |line|
+      next if line.match /^controller config \d+$/
+      next if line.match /^Building Configuration/
+      out << line.strip
+    end
+    out = out.join "\n"
+    out << "\n"
   end
 
   cfg :telnet do
@@ -43,6 +64,7 @@ class AOSW < Oxidized::Model
       end
     end
     post_login 'no paging'
+    post_login 'encrypt disable'
     if vars :enable
       pre_logout 'exit'
     end
@@ -56,7 +78,7 @@ class AOSW < Oxidized::Model
       next if line.match /Output \d Config/i
       next if line.match /(Tachometers|Temperatures|Voltages)/
       next if line.match /((Card|CPU) Temperature|Chassis Fan|VMON1[0-9])/
-      next if line.match /[0-9]+ (RPM|RPMs|mV|C)$/
+      next if line.match /[0-9]+ (RPMS?|m?V|C)/i
       out << line.strip
     end
     out = comment out.join "\n"

data/lib/oxidized/model/edgeswitch.rb

@@ -0,0 +1,25 @@
+class EdgeSwitch < Oxidized::Model
+
+# Ubiquiti EdgeSwitch #
+
+  comment '!'
+
+  prompt /[(]\w*\s\w*[)][\s#>]*[\s#>]/
+
+  cmd 'show running-config' do |cfg|
+    comment cfg.each_line.reject { |line| line.match /System Up Time.*/ or line.match /Current SNTP Synchronized Time.*/ }.join
+  end
+
+  cfg :telnet do
+    username /Username:\s/
+    passsword /^Password:\s/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'enable'
+    post_login 'terminal length 0'
+    pre_logout 'exit'
+    pre_logout 'exit'
+  end
+
+end

data/lib/oxidized/model/fortios.rb

@@ -11,6 +11,7 @@ class FortiOS < Oxidized::Model
 
   cmd 'get system status' do |cfg|
     @vdom_enabled = cfg.include? 'Virtual domain configuration: enable'
+    cfg.gsub!(/(System time: )(.*)/, '\1<stripped>\3')
     comment cfg
   end
 

data/lib/oxidized/model/ios.rb

@@ -58,7 +58,7 @@ class IOS < Oxidized::Model
     if vars :enable
       post_login do
         send "enable\n"
-        send vars(:enable) + "\n"
+        cmd vars(:enable)
       end
     end
     pre_logout 'exit'

data/lib/oxidized/model/iosxr.rb

@@ -2,7 +2,7 @@ class IOSXR < Oxidized::Model
 
   # IOS XR model #
 
-  prompt /^([\w.@:\/-]+[#>]\s?)$/
+  prompt /^(\r?[\w.@:\/-]+[#>]\s?)$/
   comment  '! '
 
   cmd :all do |cfg|

data/lib/oxidized/model/ironware.rb

@@ -31,8 +31,8 @@ class IronWare < Oxidized::Model
   cmd 'show chassis' do |cfg|
     cfg.encode!("UTF-8", :invalid => :replace) #sometimes ironware returns broken encoding
     cfg.gsub! /(^((.*)Current temp(.*))$)/, '' #remove unwanted lines current temperature
-    cfg.gsub! /Speed = [A-Z]{3} \(\d{2}\%\)/, '' #remove unwanted lines Speed Fans
-    cfg.gsub! /current speed is [A-Z]{3} \(\d{2}\%\)/, ''
+    cfg.gsub! /Speed = [A-Z-]{2,6} \(\d{2,3}\%\)/, '' #remove unwanted lines Speed Fans
+    cfg.gsub! /current speed is [A-Z]{2,6} \(\d{2,3}\%\)/, ''
     cfg.gsub! /\d{2}\.\d deg-C/, 'XX.X deg-C'
     if cfg.include? "TEMPERATURE"
       sc = StringScanner.new cfg

data/lib/oxidized/model/opengear.rb

@@ -0,0 +1,19 @@
+class OpenGear < Oxidized::Model
+
+  comment  '# '
+
+  cmd :secret do |cfg|
+    cfg.gsub!(/password (\S+)/, 'password <secret removed>')
+    cfg.gsub!(/community (\S+)/, 'community <secret removed>')
+    cfg
+  end
+
+  cmd('cat /etc/version') { |cfg| comment cfg }
+
+  cmd 'config -g config'
+
+  cfg :ssh do
+    exec true  # don't run shell, run each command in exec channel
+  end
+
+end

data/lib/oxidized/model/powerconnect.rb

@@ -26,7 +26,9 @@ class PowerConnect < Oxidized::Model
     clean cfg
   end
 
-  cmd 'show running-config'
+  cmd 'show running-config' do |cfg|
+    cfg.sub(/^(sflow \S+ destination owner \S+ timeout )\d+$/, '! \1<timeout>')
+  end
 
   cfg :telnet, :ssh do
     username /^User( Name)?:/

data/lib/oxidized/model/tmos.rb

@@ -0,0 +1,48 @@
+class TMOS < Oxidized::Model
+
+  comment  '# '
+
+  cmd :secret do |cfg|
+    cfg.gsub!(/password (\S+)/, 'password <secret removed>')
+    cfg.gsub!(/passphrase (\S+)/, 'passphrase <secret removed>')
+    cfg.gsub!(/community (\S+)/, 'community <secret removed>')
+    cfg.gsub!(/community-name (\S+)/, 'community-name <secret removed>')
+    cfg
+  end
+
+  cmd('tmsh show sys version') { |cfg| comment cfg }
+
+  cmd('tmsh show sys software') { |cfg| comment cfg }
+
+  cmd 'tmsh show sys hardware field-fmt' do |cfg|
+    cfg.gsub!(/fan-speed (\S+)/, '')
+    cfg.gsub!(/temperature (\S+)/, '')
+    comment cfg
+  end
+
+  cmd('cat /config/bigip.license') { |cfg| comment cfg }
+
+  cmd 'tmsh list' do |cfg|
+    cfg.gsub!(/state (up|down)/, '')
+    cfg.gsub!(/errors (\d+)/, '')
+    cfg
+  end
+
+  cmd('tmsh list net route all') { |cfg| comment cfg }
+
+  cmd('/bin/ls --full-time --color=never /config/ssl/ssl.crt') { |cfg| comment cfg }
+
+  cmd('/bin/ls --full-time --color=never /config/ssl/ssl.key') { |cfg| comment cfg }
+
+  cmd 'tmsh show running-config sys db all-properties' do |cfg|
+    cfg.gsub!(/sys db configsync.localconfigtime {[^}]+}/m, '')
+    cfg.gsub!(/sys db gtm.configtime {[^}]+}/m, '')
+    cfg.gsub!(/sys db ltm.configtime {[^}]+}/m, '')
+    comment cfg
+  end
+
+  cfg :ssh do
+    exec true  # don't run shell, run each command in exec channel
+  end
+
+end

data/lib/oxidized/nodes.rb

@@ -147,6 +147,7 @@ module Oxidized
         rescue  Oxidized::NodeNotFound
         end
       end
+      sort_by! { |x| x.last.nil? ? Time.new(0) : x.last.end }
     end
 
     public

data/lib/oxidized/version.rb

@@ -1,3 +1,3 @@
 module Oxidized
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
+  prerelease: 
 platform: ruby
 authors:
 - Saku Ytti
@@ -10,144 +11,162 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.21'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.21.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.21'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.21.4
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.8'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 description: software to fetch configuration from network devices and store them
@@ -160,7 +179,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".travis.yml"
+- .travis.yml
 - CHANGELOG.md
 - Dockerfile
 - Gemfile
@@ -211,6 +230,7 @@ files:
 - lib/oxidized/model/cumulus.rb
 - lib/oxidized/model/dnos.rb
 - lib/oxidized/model/edgeos.rb
+- lib/oxidized/model/edgeswitch.rb
 - lib/oxidized/model/eos.rb
 - lib/oxidized/model/fabricos.rb
 - lib/oxidized/model/fortios.rb
@@ -224,6 +244,7 @@ files:
 - lib/oxidized/model/model.rb
 - lib/oxidized/model/nos.rb
 - lib/oxidized/model/nxos.rb
+- lib/oxidized/model/opengear.rb
 - lib/oxidized/model/outputs.rb
 - lib/oxidized/model/panos.rb
 - lib/oxidized/model/powerconnect.rb
@@ -232,6 +253,7 @@ files:
 - lib/oxidized/model/saos.rb
 - lib/oxidized/model/screenos.rb
 - lib/oxidized/model/timos.rb
+- lib/oxidized/model/tmos.rb
 - lib/oxidized/model/vrp.rb
 - lib/oxidized/model/vyatta.rb
 - lib/oxidized/model/xos.rb
@@ -253,25 +275,26 @@ files:
 homepage: http://github.com/ytti/oxidized
 licenses:
 - Apache-2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: oxidized
-rubygems_version: 2.4.5.1
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: feeble attempt at rancid
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: cdb31290367c66dd2c76fe99a93efa832e676446
-  data.tar.gz: 23e3a5a6c42f603d72e8266f2b705e03edec502b
-SHA512:
-  metadata.gz: 48675858978583b89c86a3943fe4f95a78d44eedffe4ae59a0e624a608707a9e85ad93277e3bd878710777208bc45100b10dc8fd9824f67fe476d0db9577ed41
-  data.tar.gz: 4f2dfe9e24f3e6f9afe878c5cf786c89701aaeb531966d37dd2e37e188be6069cbca9358f3a61b6bf9db8cf4e02c5261bbe45d90f2625784445cec127427b8bf