oxidized 0.12.2 → 0.13.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6abed81dacfe3d68bc4abd336da9ba97b39f47a7
+  data.tar.gz: 5110c826165ef2d14c19369e0c6662fde52c7bd6
+SHA512:
+  metadata.gz: 96c4383cfa03d6ef2def511de0b23c2b28c4d275caa3f16f1c9e2b926514245ad8bdf945a0726892152fcda4a04454b43ec7cab6d0f10cb474dc6a4974767839
+  data.tar.gz: f6292b48c50e0d74d971df1345c7d391ef44b9a003eb429482f90e113f59633b2cf30b3227e8b8a372b1ff8203a169b49963f5bec75bb0f00d6f2f8a73de081a

data/.travis.yml

@@ -1,3 +1,5 @@
 language: ruby
+sudo: false
+cache: bundler
 rvm:
   - 2.1.6

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+# 0.13.0
+- FEATURE: http post for configs (by @jgroom33)
+- FEATURE: support ericsson redbacks (by @roedie)
+- FEATURE: support motorola wireless controllers (by @roadie)
+- FEATURE: support citrix netscaler (by @roadie)
+- FEATURE: support datacom devices (by @danilopopeye)
+- FEATURE: support netonix devices
+- FEATURE: support specifying ssh cipher and kex (by @roadie)
+- FEATURE: rename proxy to ssh_proxy (by @roadie)
+- FEATURE: support ssh keys on ssh_proxy (by @awix)
+- BUGFIX: various (by @danilopopeye)
+- BUGFIX: Node#repo with groups (by @danilopopeye)
+- BUGFIX: githubrepohoook (by @danilopopeye)
+- BUGFIX: fortios, airos, junos, xos, edgeswitch, nos, tmos, procurve, ipos models
+
 # 0.12.2
 - BUGFIX: more MRV model fixes (by @natm)
 
@@ -12,7 +27,7 @@
 - FEATURE: EdgeSwitch support (by @doogieconsulting)
 - BUGFIX: rename input debug log files
 - BUGFIX: powerconnect model fixes (by @Madpilot0)
-- BUGFIX: fortigate model fixes (by @ElvinEfendi) 
+- BUGFIX: fortigate model fixes (by @ElvinEfendi)
 - BUGFIX: various (by @mikebryant)
 - BUGFIX: write SSH debug to file without buffering
 - BUGFIX: fix IOS XR prompt handling

data/Gemfile.lock

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

data/README.md

@@ -31,6 +31,7 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
     * [Source: SQLite](#source-sqlite)
     * [Source: HTTP](#source-http)
     * [Output: GIT](#output-git)
+    * [Output: HTTP](#output-http)
     * [Output: File](#output-file)
     * [Output types](#output-types)
     * [Advanced Configuration](#advanced-configuration)
@@ -70,13 +71,20 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
    * IOSXR
    * NXOS
    * SMB (Nikola series)
+ * Citrix
+   * NetScaler (Virtual Applicance)
  * Cumulus
    * Linux
+ * DataCom
+   * DmSwitch 3000
  * DELL
    * PowerConnect
    * AOSW
+ * Ericsson/Redback
+   * IPOS (former SEOS)
  * Extreme Networks
    * XOS
+   * WM
  * F5
    * TMOS
  * Force10
@@ -94,8 +102,12 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
    * ScreenOS (Netscreen)
  * Mikrotik
    * RouterOS
+ * Motorola
+   * RFS
  * MRV
    * MasterOS
+ * Netonix
+   * WISP Switch (As Netonix)
  * Opengear
    * Opengear
  * Palo Alto
@@ -121,7 +133,7 @@ gem install oxidized-script oxidized-web # if you don't install oxidized-web, ma
 ## 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
 ```shell
-yum install cmake sqlite-devel openssl-devel
+yum install cmake sqlite-devel openssl-devel libssh2-devel
 ```
 
 Now lets install oxidized via Rubygems:
@@ -136,6 +148,21 @@ Oxidized configuration is in YAML format. Configuration files are subsequently s
 
 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.
+
+```
+OXIDIZED_HOME=/etc/oxidized
+
+$ tree -L 1 /etc/oxidized
+/etc/oxidized/
+├── config
+├── log-router-ssh
+├── log-router-telnet
+├── pid
+├── router.db
+└── repository.git
+```
+
 ## Source
 
 Oxidized supports ```CSV```, ```SQLite``` and ```HTTP``` as source backends. The CSV backend reads nodes from a rancid compatible router.db file. The SQLite backend will fire queries against a database and map certain fields to model items. The HTTP backend will fire queries against a http/https url. Take a look at the [Cookbook](#cookbook) for more details.
@@ -181,7 +208,7 @@ Install Ruby 2.1.2 build dependencies
 ```
 yum install curl gcc-c++ patch readline readline-devel zlib zlib-devel
 yum install libyaml-devel libffi-devel openssl-devel make cmake
-yum install bzip2 autoconf automake libtool bison iconv-devel
+yum install bzip2 autoconf automake libtool bison iconv-devel libssh2-devel
 ```
 
 Install RVM
@@ -283,7 +310,7 @@ source:
 
 ### SSH Proxy Command
 
-Oxidized can `ssh` through a proxy as well. To do so we just need to set `proxy` variable.
+Oxidized can `ssh` through a proxy as well. To do so we just need to set `ssh_proxy` variable.
 
 ```
 ...
@@ -292,7 +319,7 @@ map:
   model: 1
 vars_map:
   enable: 2
-  proxy: 3
+  ssh_proxy: 3
 ...
 ```
 
@@ -354,13 +381,53 @@ output:
 
 This uses the rugged/libgit2 interface. So you should remember that normal Git hooks will not be executed.
 
+
+For a single repositories for all devices:
+
+``` yaml
+output:
+  default: git
+  git:
+    user: Oxidized
+    email: o@example.com
+    repo: "/var/lib/oxidized/devices.git"
 ```
+
+And for groups repositories:
+
+``` yaml
 output:
   default: git
   git:
     user: Oxidized
     email: o@example.com
+    repo:
+      first: "/var/lib/oxidized/first.git"
+      second: "/var/lib/oxidized/second.git"
+```
+
+If you would like to use groups and a single repository, you can force this with the `single_repo` config.
+
+``` yaml
+output:
+  default: git
+  git:
+    single_repo: true
     repo: "/var/lib/oxidized/devices.git"
+
+```
+
+### Output: Http
+
+POST a config to the specified URL
+
+```
+output:
+  default: http
+  http:
+    user: admin
+    password: changeit
+    url: "http://192.168.162.50:8080/db/coll"
 ```
 
 ### Output types
@@ -525,6 +592,42 @@ hooks:
     timeout: 120
 ```
 
+### githubrepo
+
+This hook configures the repository `remote` and _push_ the code when the specified event is triggerd. If the `username` and `password` are not provided, the `Rugged::Credentials::SshKeyFromAgent` will be used.
+
+`githubrepo` hook recognizes following configuration keys:
+
+  * `remote_repo`: the remote repository to be pushed to.
+  * `username`: username for repository auth.
+  * `password`: password for repository auth.
+  * `publickey`: publickey for repository auth.
+  * `privatekey`: privatekey for repository auth.
+
+When using groups repositories, each group must have its own `remote` in the `remote_repo` config.
+
+``` yaml
+hooks:
+  push_to_remote:
+    remote_repo:
+      routers: git@git.intranet:oxidized/routers.git
+      switches: git@git.intranet:oxidized/switches.git
+      firewalls: git@git.intranet:oxidized/firewalls.git
+```
+
+
+## Hook configuration example
+
+``` yaml
+hooks:
+  push_to_remote:
+    type: githubrepo
+    events: [post_store]
+    remote_repo: git@git.intranet:oxidized/test.git
+    username: user
+    password: pass
+```
+
 # Ruby API
 
 The following objects exist in Oxidized.

data/extra/oxidized.init.d

@@ -0,0 +1,87 @@
+#!/bin/sh
+# chkconfig: - 99 01
+# description: Oxidized - Network Device Configuration Backup Tool
+# processname: /opt/ruby-2.1/bin/oxidized
+
+# Source function library
+. /etc/rc.d/init.d/functions
+
+name="oxidized"
+desc="Oxidized"
+cmd=oxidized
+args="--daemonize"
+lockfile=/var/lock/subsys/$name
+pidfile=/etc/oxidized/pid
+
+export OXIDIZED_HOME=/etc/oxidized
+
+# Source sysconfig configuration
+[ -r /etc/sysconfig/$name ] && . /etc/sysconfig/$name
+
+start() {
+    echo -n $"Starting $desc: "
+    daemon ${cmd} ${args}
+    retval=$?
+    if [ $retval = 0 ]
+    then
+        echo_success
+        touch $lockfile
+    else
+        echo_failure
+    fi
+    echo
+    return $retval
+}
+
+stop() {
+    echo -n $"Stopping $desc: "
+    killproc -p $pidfile
+    retval=$?
+    [ $retval -eq 0 ] && rm -f $lockfile
+    rm -f $pidfile
+    echo
+    return $retval
+}
+
+restart() {
+    stop
+    start
+}
+
+reload() {
+  echo -n $"Reloading config..."
+  curl -s http://localhost:8888/reload?format=json -O /dev/null
+  echo
+}
+
+rh_status() {
+    status -p $pidfile $cmd
+}
+
+rh_status_q() {
+    rh_status >/dev/null 2>&1
+}
+
+case "$1" in
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
+        ;;
+    restart)
+        $1
+        ;;
+    reload)
+        rh_status_q || exit 0
+        $1
+        ;;
+    status)
+        rh_status
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|restart|reload|status}"
+        exit 2
+esac

data/lib/oxidized.rb

@@ -3,6 +3,7 @@ module Oxidized
 
   Directory = File.expand_path(File.join(File.dirname(__FILE__), '../'))
 
+  require 'oxidized/version'
   require 'oxidized/string'
   require 'oxidized/config'
   require 'oxidized/config/vars'

data/lib/oxidized/cli.rb

@@ -43,6 +43,10 @@ module Oxidized
       opts = Slop.new(:help=>true) do
         on 'd', 'debug', 'turn on debugging'
         on 'daemonize',  'Daemonize/fork the process'
+        on 'v', 'version', 'show version' do
+          puts Oxidized::VERSION
+          Kernel.exit
+        end
       end
       [opts.parse!, opts]
     end

data/lib/oxidized/config.rb

@@ -3,7 +3,7 @@ module Oxidized
   class NoConfig < OxidizedError; end
   class InvalidConfig < OxidizedError; end
   class Config
-    Root      = File.join ENV['HOME'], '.config', 'oxidized'
+    Root      = ENV['OXIDIZED_HOME'] || File.join(ENV['HOME'], '.config', 'oxidized')
     Crash     = File.join Root, 'crash'
     Log       = File.join Root, 'log'
     InputDir  = File.join Directory, %w(lib oxidized input)
@@ -27,7 +27,7 @@ module Oxidized
       asetus.default.timeout       = 20
       asetus.default.retries       = 3
       asetus.default.prompt        = /^([\w.@-]+[#>]\s?)$/
-        asetus.default.rest          = '127.0.0.1:8888' # or false to disable
+      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
 

data/lib/oxidized/hook/githubrepo.rb

@@ -1,12 +1,12 @@
 class GithubRepo < Oxidized::Hook
   def validate_cfg!
-    cfg.has_key?('remote_repo') or raise KeyError, 'remote_repo is required'
+    raise KeyError, 'hook.remote_repo is required' unless cfg.has_key?('remote_repo')
   end
 
   def run_hook(ctx)
-    repo = Rugged::Repository.new(Oxidized.config.output.git.repo)
+    repo = Rugged::Repository.new(ctx.node.repo)
     log "Pushing local repository(#{repo.path})..."
-    remote = repo.remotes['origin'] || repo.remotes.create('origin', cfg.remote_repo)
+    remote = repo.remotes['origin'] || repo.remotes.create('origin', remote_repo(ctx.node))
     log "to remote: #{remote.url}"
 
     fetch_and_merge_remote(repo)
@@ -49,9 +49,21 @@ class GithubRepo < Oxidized::Hook
       log "Using https auth", :debug
       Rugged::Credentials::UserPassword.new(username: cfg.username, password: cfg.password)
     else
-      log "Using ssh auth", :debug
-      Rugged::Credentials::SshKeyFromAgent.new(username: 'git')
+      if cfg.has_key?('publickey') && cfg.has_key?('privatekey')
+        log "Using ssh auth with key", :debug
+        Rugged::Credentials::SshKey.new(username: 'git', publickey: File.expand_path(cfg.publickey), privatekey: File.expand_path(cfg.privatekey))
+      else
+        log "Using ssh auth with agentforwarding", :debug
+        Rugged::Credentials::SshKeyFromAgent.new(username: 'git')
+      end
     end
   end
 
+  def remote_repo(node)
+    if node.group.nil? || cfg.remote_repo.is_a?(String)
+      cfg.remote_repo
+    else
+      cfg.remote_repo[node.group]
+    end
+  end
 end

data/lib/oxidized/input/ssh.rb

@@ -23,15 +23,21 @@ module Oxidized
       secure = Oxidized.config.input.ssh.secure
       @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")
+      if proxy_host = vars(:ssh_proxy)
+        proxy =  Net::SSH::Proxy::Command.new("ssh #{proxy_host} -W %h:%p")
       end
-      @ssh = Net::SSH.start(@node.ip, @node.auth[:username], :port => port.to_i,
-                            :password => @node.auth[:password], :timeout => Oxidized.config.timeout,
-                            :paranoid => secure,
-                            :auth_methods => %w(none publickey password keyboard-interactive),
-                            :number_of_password_prompts => 0,
-                            :proxy => proxy)
+      ssh_opts = {
+        :port => port.to_i,
+        :password => @node.auth[:password], :timeout => Oxidized.config.timeout,
+        :paranoid => secure,
+        :auth_methods => %w(none publickey password keyboard-interactive),
+        :number_of_password_prompts => 0,
+        :proxy => proxy
+      }
+      ssh_opts[:kex] = vars(:ssh_kex).split(/,\s*/) if vars(:ssh_kex)
+      ssh_opts[:encryption] = vars(:ssh_encryption).split(/,\s*/) if vars(:ssh_encryption)
+
+      @ssh = Net::SSH.start(@node.ip, @node.auth[:username], ssh_opts)
       unless @exec
         shell_open @ssh
         begin
@@ -86,7 +92,7 @@ module Oxidized
           @output << data
           @output = @node.model.expects @output
         end
-        ch.request_pty (opts={:term=>'vt100'}) do |_ch, success_pty|
+        ch.request_pty (_opts={:term=>'vt100'}) do |_ch, success_pty|
           raise NoShell, "Can't get PTY" unless success_pty
           ch.send_channel_request 'shell' do |_ch, success_shell|
             raise NoShell, "Can't get shell" unless success_shell

data/lib/oxidized/model/airos.rb

@@ -7,7 +7,7 @@ class Airos < Oxidized::Model
     cfg.split("\n").map { |line| "# #{line}" }.join("\n") + "\n"
   end
   
-  cmd 'cat /tmp/system.cfg'
+  cmd 'sort /tmp/system.cfg'
   
   cmd :secret do |cfg|
     cfg.gsub! /^(users\.\d+\.password|snmp\.community)=.+/, "# \\1=<hidden>"

data/lib/oxidized/model/datacom.rb

@@ -0,0 +1,33 @@
+class DataCom < Oxidized::Model
+
+  comment '! '
+
+  expect /^--More--\s+$/ do |data, re|
+    send ' '
+    data.sub re, ''
+  end
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+    cfg.cut_head.cut_tail
+  end
+
+  cmd 'show firmware' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show system' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg.cut_head
+  end
+
+  cfg :telnet, :ssh do
+    username /login:\s$/
+    password /^Password:\s$/
+    pre_logout 'exit'
+  end
+
+end

data/lib/oxidized/model/edgeswitch.rb

@@ -4,22 +4,29 @@ class EdgeSwitch < Oxidized::Model
 
   comment '!'
 
-  prompt /[(]\w*\s\w*[)][\s#>]*[\s#>]/
+  prompt /\(.*\)\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
+    cfg.each_line.to_a[2..-2].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/
+    password /^Password:\s/
   end
 
   cfg :telnet, :ssh do
-    post_login 'enable'
-    post_login 'terminal length 0'
-    pre_logout 'exit'
-    pre_logout 'exit'
+    post_login do
+      if vars :enable
+        send "enable\n"
+        cmd vars(:enable)
+      else
+        cmd 'enable'
+      end
+      cmd 'terminal length 0'
+    end
+    pre_logout 'quit'
+    pre_logout 'n'
   end
 
-end
+end

data/lib/oxidized/model/fortios.rb

@@ -2,11 +2,16 @@ 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.sub re, ''
+  end
 
   cmd :all do |cfg, cmdstring|
     new_cfg = comment "COMMAND: #{cmdstring}\n"
-    new_cfg << cfg.each_line.to_a[1..-2].join
+    new_cfg << cfg.each_line.to_a[1..-2].map { |line| line.gsub(/(conf_file_ver=)(.*)/, '\1<stripped>\3') }.join
   end
 
   cmd 'get system status' do |cfg|

data/lib/oxidized/model/ios.rb

@@ -25,6 +25,10 @@ class IOS < Oxidized::Model
   cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
     cfg.gsub! /username (\S+) privilege (\d+) (\S+).*/, '<secret hidden>'
+    cfg.gsub! /^username \S+ password \d \S+/, '<secret hidden>'
+    cfg.gsub! /^enable password \d \S+/, '<secret hidden>'
+    cfg.gsub! /wpa-psk ascii \d \S+/, '<secret hidden>'
+    cfg.gsub! /^tacacs-server key \d \S+/, '<secret hidden>'
     cfg
   end
 

data/lib/oxidized/model/ipos.rb

@@ -0,0 +1,61 @@
+class IPOS < Oxidized::Model
+
+  # Ericsson SSR (IPOS)
+  # Redback SE (SEOS)
+
+  prompt /^([\[\]\w.@-]+[#>]\s?)$/
+  comment '! '
+
+  cmd 'show chassis' do |cfg|
+    comment cfg.each_line.to_a[0..-2].join
+  end
+
+  cmd 'show hardware' do |cfg|
+    comment cfg.each_line.to_a[0..-2].join
+  end
+
+  cmd 'show release' do |cfg|
+    comment cfg.each_line.to_a[0..-2].join
+  end
+
+  cmd 'show configuration' do |cfg|
+    # SEOS regularly adds some odd line breaks in random places
+    # when showing the config, triggering changes.
+    cfg.gsub! "\r\n", "\n"
+
+    cfg = cfg.each_line.to_a
+
+    # Keeps the issued command commented but removes the uncommented "Building configuration..."
+    # and "Current configuration:" lines as well as the last prompt at the end.
+    cfg = cfg[4..-2].unshift comment cfg[0]
+
+    # Later IPOS releases add this line in addition to the usual "last changed" line.
+    # It's touched regularly (as often as multiple times per minute) by the OS without actual visible config changes.
+    cfg = cfg.reject { |line| line.match "Configuration last changed by system user" }
+
+    # Earlier IPOS releases lack the "changed by system user" line and instead overwrite
+    # the single "last changed by user" line. Because the line has a timestamp it will
+    # trigger constant changes if not removed. By doing so there will only be a single
+    # extra change trigged after an actual config change by a user but still have the
+    # real user.
+    cfg = cfg.reject { |line| line.match "Configuration last changed by user '%LICM%' at" }
+    cfg = cfg.reject { |line| line.match "Configuration last changed by user '<NO USER>' at" }
+    cfg = cfg.reject { |line| line.match "Configuration last changed by user '' at" }
+
+    cfg.join
+  end
+
+  cfg :telnet do
+    username /^login:/
+    password /^\r*password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'terminal length 0'
+    pre_logout do
+      send "exit\n"
+      send "n\n"
+    end
+  end
+
+end

data/lib/oxidized/model/junos.rb

@@ -30,6 +30,8 @@ class JunOS < Oxidized::Model
     case @model
     when 'mx960'
       out << cmd('show chassis fabric reachability')  { |cfg| comment cfg }
+    when /^(ex22|ex33|ex4|ex8|qfx)/
+      out << cmd('show virtual-chassis') { |cfg| comment cfg }
     end
     out
   end

data/lib/oxidized/model/mtrlrfs.rb

@@ -0,0 +1,37 @@
+class Mtrlrfs < Oxidized::Model
+
+  # Motorola RFS/Extreme WM
+
+  comment  '# '
+
+  cmd :all do |cfg|
+    # xos inserts leading \r characters and other trailing white space.
+    # this deletes extraneous \r and trailing white space.
+    cfg.each_line.to_a[1..-2].map{|line|line.delete("\r").rstrip}.join("\n") + "\n"
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show licenses' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show running-config'
+
+  cfg :telnet do
+    username /^login:/
+    password /^\r*password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'terminal length 0'
+    pre_logout do
+      send "exit\n"
+      send "n\n"
+    end
+  end
+
+end
+

data/lib/oxidized/model/netonix.rb

@@ -0,0 +1,15 @@
+class Netonix < Oxidized::Model
+  prompt /^[\w\s.@_\/:-]+#/
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd 'cat config.json;echo'
+
+  cfg :ssh do
+    post_login 'cmdline'
+    pre_logout 'exit'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/netscaler.rb

@@ -0,0 +1,24 @@
+class NetScaler < Oxidized::Model
+
+  prompt /^\>\s*$/
+  comment '# '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-3].join
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show hardware' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show ns ns.conf'
+
+  cfg :ssh do
+    pre_logout 'exit'
+  end
+
+end

data/lib/oxidized/model/nos.rb

@@ -33,7 +33,7 @@ class NOS < Oxidized::Model
 
   cfg :telnet do
     username /^.* login: /
-    username /^Password:/
+    password /^Password:/
   end
 
   cfg :telnet, :ssh do

data/lib/oxidized/model/procurve.rb

@@ -1,36 +1,49 @@
 class Procurve < Oxidized::Model
 
-  # FIXME: this is way too unsafe
-  prompt /.*?(\w+# ).*/m
+  # some models start lines with \r 
+  # previous command is repeated followed by "\eE", which sometimes ends up on last line
+  prompt /^\r?([\w -]+\eE)?([\w-]+# )$/
 
   comment  '! '
 
+  # replace all used vt100 control sequences
+  expect /\e\[\??\d+(;\d+)*[A-Za-z]/ do |data, re|
+    data.gsub re, ''
+  end
+
   expect /Press any key to continue/ do
-     send ' '
-     ""
+    send ' '
+    ""
   end
 
   cmd :all do |cfg|
     cfg = cfg.each_line.to_a[1..-3].join
-    cfg = cfg.gsub /\r/, ''
-    new_cfg = ''
-    cfg.each_line do |line|
-      line.sub! /^\e.*(\e.*)/, '\1'  #leave last escape
-      line.sub! /\e\[24;1H/, ''      #remove last escape, is it always this?
-      new_cfg << line
-    end
-    new_cfg
+    cfg = cfg.gsub /^\r/, ''
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
+    cfg.gsub! /^(snmp-server host).*/, '\\1 <configuration removed>'
+    cfg.gsub! /^(radius-server host).*/, '\\1 <configuration removed>'
+    cfg
   end
 
   cmd 'show version' do |cfg|
     comment cfg
   end
 
+  # not supported on all models
   cmd 'show system-information' do |cfg|
     cfg = cfg.split("\n")[0..-8].join("\n")
     comment cfg
   end
 
+  # not supported on all models
+  cmd 'show system information' do |cfg|
+    cfg = cfg.split("\n")[0..-8].join("\n")
+    comment cfg
+  end
+
   cmd 'show running-config'
 
   cfg :telnet do

data/lib/oxidized/model/tmos.rb

@@ -22,25 +22,27 @@ class TMOS < Oxidized::Model
 
   cmd('cat /config/bigip.license') { |cfg| comment cfg }
 
-  cmd 'tmsh list' do |cfg|
-    cfg.gsub!(/state (up|down)/, '')
+  cmd 'tmsh -q list' do |cfg|
+    cfg.gsub!(/state (up|down|checking|irule-down)/, '')
     cfg.gsub!(/errors (\d+)/, '')
     cfg
   end
 
-  cmd('tmsh list net route all') { |cfg| comment cfg }
+  cmd('tmsh -q 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|
+  cmd 'tmsh -q 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
 
+  cmd('cat /config/partitions/*/bigip.conf') { |cfg| comment cfg }
+
   cfg :ssh do
     exec true  # don't run shell, run each command in exec channel
   end

data/lib/oxidized/model/xos.rb

@@ -36,8 +36,10 @@ class XOS < Oxidized::Model
 
   cfg :telnet, :ssh do
     post_login 'disable clipaging'
-    pre_logout 'exit'
-    pre_logout 'n'
+    pre_logout do
+      send "exit\n"
+      send "n\n"
+    end
   end
 
 end

data/lib/oxidized/node.rb

@@ -24,7 +24,7 @@ module Oxidized
       @vars           = opt[:vars]
       @stats          = Stats.new
       @retry          = 0
-      @repo           = Oxidized.config.output.git.repo
+      @repo           = resolve_repo
 
       # model instance needs to access node instance
       @model.node = self
@@ -170,5 +170,15 @@ module Oxidized
       Oxidized.mgr.model[model].new
     end
 
+    def resolve_repo
+      remote_repo = Oxidized.config.output.git.repo
+
+      if Oxidized.config.output.git.single_repo? || @group.nil? || remote_repo.is_a?(String)
+        remote_repo
+      else
+        remote_repo[@group]
+      end
+    end
+
   end
 end

data/lib/oxidized/output/http.rb

@@ -0,0 +1,58 @@
+module Oxidized
+  class Http < Output
+    attr_reader :commitref
+    def initialize
+      @cfg = Oxidized.config.output.http
+    end
+
+    def setup
+      if @cfg.empty?
+        CFGS.user.output.http.user  = 'Oxidized'
+        CFGS.user.output.http.pasword = 'secret'
+        CFGS.user.output.http.url  =  'http://localhost/web-api/oxidized'
+        CFGS.save :user
+        raise NoConfig, 'no output http config, edit ~/.config/oxidized/config'
+      end
+    end
+    require "net/http"
+    require "uri"
+    require "json"
+    def store node, outputs, opt={}
+      @commitref = nil
+      json = JSON.pretty_generate(
+          {
+              'msg' => opt[:msg],
+              'user' => opt[:user],
+              'email' => opt[:email],
+              'group' => opt[:group],
+              'node' => node,
+              'config' => outputs.to_cfg,
+              # actually we need to also iterate outputs, for other types like in gitlab. But most people don't use 'type' functionality.
+          }
+      )
+      uri = URI.parse @cfg.url
+      http = Net::HTTP.new uri.host, uri.port
+      #http.use_ssl = true if uri.scheme = 'https'
+      req = Net::HTTP::Post.new(uri.request_uri, initheader = { 'Content-Type' => 'application/json'})
+      req.basic_auth @cfg.user, @cfg.password
+      req.body = json
+      response = http.request req
+
+      case response.code.to_i
+        when 200 || 201
+          Oxidized.logger.info "Configuration http backup complete for #{node}"
+          p [:success]
+        when (400..499)
+          Oxidized.logger.info "Configuration http backup for #{node} failed status: #{response.body}"
+          p [:bad_request]
+        when (500..599)
+          p [:server_problems]
+          Oxidized.logger.info "Configuration http backup for #{node} failed status: #{response.body}"
+      end
+
+    end
+
+  end
+end
+
+

data/lib/oxidized/version.rb

@@ -1,3 +1,3 @@
 module Oxidized
-  VERSION = '0.12.2'
+  VERSION = '0.13.0'
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.12.2
-  prerelease: 
+  version: 0.13.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -11,162 +10,144 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2016-03-30 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
@@ -179,7 +160,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .travis.yml
+- ".travis.yml"
 - CHANGELOG.md
 - Dockerfile
 - Gemfile
@@ -193,6 +174,7 @@ files:
 - extra/nagios_check_failing_nodes.rb
 - extra/oxidized-report-git-commits
 - extra/oxidized.init
+- extra/oxidized.init.d
 - extra/oxidized.runit
 - extra/oxidized.service
 - extra/oxidized.supervisord
@@ -228,6 +210,7 @@ files:
 - lib/oxidized/model/ciscosmb.rb
 - lib/oxidized/model/comware.rb
 - lib/oxidized/model/cumulus.rb
+- lib/oxidized/model/datacom.rb
 - lib/oxidized/model/dnos.rb
 - lib/oxidized/model/edgeos.rb
 - lib/oxidized/model/edgeswitch.rb
@@ -237,11 +220,15 @@ files:
 - lib/oxidized/model/ftos.rb
 - lib/oxidized/model/ios.rb
 - lib/oxidized/model/iosxr.rb
+- lib/oxidized/model/ipos.rb
 - lib/oxidized/model/ironware.rb
 - lib/oxidized/model/isam.rb
 - lib/oxidized/model/junos.rb
 - lib/oxidized/model/masteros.rb
 - lib/oxidized/model/model.rb
+- lib/oxidized/model/mtrlrfs.rb
+- lib/oxidized/model/netonix.rb
+- lib/oxidized/model/netscaler.rb
 - lib/oxidized/model/nos.rb
 - lib/oxidized/model/nxos.rb
 - lib/oxidized/model/opengear.rb
@@ -263,6 +250,7 @@ files:
 - lib/oxidized/nodes.rb
 - lib/oxidized/output/file.rb
 - lib/oxidized/output/git.rb
+- lib/oxidized/output/http.rb
 - lib/oxidized/output/output.rb
 - lib/oxidized/source/csv.rb
 - lib/oxidized/source/http.rb
@@ -275,26 +263,25 @@ 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: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: oxidized
-rubygems_version: 1.8.23
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: feeble attempt at rancid
 test_files: []