oxidized 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe0fdfc750565821617c3d13ebe990821f30aeec
-  data.tar.gz: 3030719bac957813ff5a56799cd76a95e7219789
+  metadata.gz: 1bfddbfd99ad2fed7d779ec60118dbd86f4bad07
+  data.tar.gz: beaccfd0dfd4b30f324bee21e24057972d76ec9d
 SHA512:
-  metadata.gz: adfc55ef26a4b72afc8e165f3c7e7b5ed4e138185125ed6601bd68cc2b9597f8549f0893be75627d3ecd9c793796d63a3b0985294c44dcff9aa11de5ab898ea3
-  data.tar.gz: 0eec4da96cd31c171c8507152a9fbe555a1833e46ead96c6085d16180d0b28a35f523eaf3d1c5153e222863a133918208049c5a23c8a954ab623731bbaa1cb4a
+  metadata.gz: bae25268e3a819d06d65d4eb633946e7db774b078bed111ab3a99d351f449adfb6f6ae4cd862c214caceea990050057f3b59e2dd83ef80cfb45d1ba52ca8cb4a
+  data.tar.gz: 518319120a58a267662c2dd27bda071b505a5ced89c94d38936ad69a0eedf015ba1c15aa47b43a24032d26238a77cc35d15c6260456ac563c3057db818cec43b

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.5.0
+- FEATURE: Mikrotik RouterOS model (by @emjemj)
+- FEATURE: add support for Cisco VSS (by @MrRJ45)
+- BUGFIX: general fixes to powerconnect model (by @MrRJ45)
+- BUGFIX: fix initial commit issues with rugged (by @MrRJ45)
+- BUGFIX: pager error for old dell powerconnect switches (by @emjemj)
+- BUGFIX: logout error for old dell powerconnect switches (by @emjemj)
+
 # 0.4.1
 - BUGFIX: handle missing output file (by @brandt)
 - BUGFIX: fix passwordless enable on Arista EOS model (by @brandt)

data/README.md

@@ -1,6 +1,8 @@
 # Oxidized
 
-Oxidized is a network device configration backup tool. Its a RANCID replacment!
+[![Gem Version](https://badge.fury.io/rb/oxidized.svg)](http://badge.fury.io/rb/oxidized)
+
+Oxidized is a network device configuration backup tool. It's a RANCID replacment!
 
 * automatically adds/removes threads to meet configured retrieval interval
 * restful API to move node immediately to head-of-queue (GET/POST /node/next/[NODE])
@@ -62,6 +64,7 @@ Oxidized is a network device configration backup tool. Its a RANCID replacment!
  * Huawei VRP
  * Juniper JunOS
  * Juniper ScreenOS (Netscreen)
+ * Mikrotik RouterOS
  * Ubiquiti AirOS
 
 

data/extra/oxidized.supervisord

@@ -0,0 +1,10 @@
+# by @MrRJ45 at issues #45
+
+[program:oxidized]
+command=/usr/local/bin/oxidized
+autostart=true
+autorestart=true
+user=oxidized
+stderr_logfile=/var/log/oxidized.err.log
+stdout_logfile=/var/log/oxidized.out.log
+environment=HOME='/home/oxidized/'

data/extra/oxidized.upstart

@@ -0,0 +1,18 @@
+# by @andrewpwade in issue #45
+
+start on started networking
+
+respawn
+
+setuid oxidized
+setgid oxidized
+
+chdir /home/oxidized
+
+env HOME=/home/oxidized
+
+pre-start script
+    test -x /usr/local/bin/oxidized || { stop; exit 0; }
+end script
+
+exec /usr/local/bin/oxidized

data/extra/syslog.rb

@@ -1,20 +1,22 @@
 #!/usr/bin/env ruby
 
 # IOS:
-# logging discriminator CFG mnemonics includes CONFIG_I 
+# logging discriminator CFG mnemonics includes CONFIG_I
 # logging host SERVER discriminator CFG
 
 # JunOS:
 # set system syslog host SERVER interactive-commands notice
 # set system syslog host SERVER match "^mgd\[[0-9]+\]: UI_COMMIT: .*"
 
+# Ports < 1024 need extra privileges, use a port higher than this by passing the first argument a number
+# To use the default port for syslog (514) you shouldnt pass an argument, but you will need to allow this with:
 # sudo setcap 'cap_net_bind_service=+ep' /usr/bin/ruby
 
 # exit if fork   ## TODO: proper daemonize
 
 require 'socket'
 require 'resolv'
-require './rest_client'
+require_relative 'rest_client'
 
 module Oxidized
   class SyslogMonitor
@@ -25,12 +27,13 @@ module Oxidized
     PORT = 514
     FILE = 'messages'
     MSG = {
-      :ios   => '%SYS-5-CONFIG_I:',
+      :ios   => /%SYS-(SW[0-9]+-)?5-CONFIG_I:/,
       :junos => 'UI_COMMIT:',
     }
 
     class << self
       def udp port=PORT, listen=0
+        port ||= PORT
         io = UDPSocket.new
         io.bind listen, port
         new io, :udp
@@ -42,7 +45,7 @@ module Oxidized
       end
     end
 
-    private 
+    private
 
     def initialize io, mode=:udp
       @mode = mode
@@ -72,7 +75,7 @@ module Oxidized
 
     def handle_log log, ip
       log = log.to_s.split ' '
-      if i = log.index(MSG[:ios])
+      if i = log.find_index { |e| e.match( MSG[:ios] ) }
         ios ip, log,  i
       elsif i = log.index(MSG[:junos])
         jnpr ip, log, i
@@ -86,7 +89,7 @@ module Oxidized
         if @mode == :udp
           log, ip = log.recvfrom_nonblock 2000
           ip = ip.last
-        else 
+        else
           begin
             log = log.read_nonblock 2000
           rescue EOFError
@@ -106,5 +109,5 @@ module Oxidized
   end
 end
 
-Oxidized::SyslogMonitor.udp
+Oxidized::SyslogMonitor.udp ARGV[0]
 #Oxidized::SyslogMonitor.file '/var/log/poop'

data/lib/oxidized/model/asa.rb

@@ -23,7 +23,7 @@ class ASA < Oxidized::Model
     comment cfg
   end
 
-  cmd 'show running-config' do |cfg|
+  cmd 'more system:running-config' do |cfg|
     cfg = cfg.each_line.to_a[3..-1].join
     cfg.gsub! /^: [^\n]*\n/, ''
     cfg

data/lib/oxidized/model/junos.rb

@@ -9,7 +9,7 @@ class JunOS < Oxidized::Model
   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.map { |line| line.rstrip }.join "\n"
   end
 
   cmd :secret do |cfg| 

data/lib/oxidized/model/powerconnect.rb

@@ -19,9 +19,8 @@ class PowerConnect < Oxidized::Model
   end
 
   cmd 'show system' do |cfg|
-    cfg = cfg.split("\n").select { |line| not line[/Up\sTime/] }
-    cfg = cfg[0..-28]<<" "
-    comment cfg.join("\n")
+    @model = $1 if cfg.match /Power[C|c]onnect (\d{4})[P|F]?/
+    clean cfg
   end
 
   cmd 'show running-config'
@@ -39,9 +38,31 @@ class PowerConnect < Oxidized::Model
       end
     end
 
+    post_login "terminal datadump"
     post_login "terminal length 0"
     pre_logout "logout"
+    pre_logout "exit"
     
   end
 
+  def clean cfg
+    out = []
+    skip_block = false
+    cfg.each_line do |line|
+      if line.match /Up\sTime|Temperature|Power Supplies/i
+        # For 34xx, 54xx, 55xx, and 8024F we should skip this block (terminated by a blank line)
+        skip_block = true if @model =~ /^(34|35)(24|48)$|^(54|55)(24|48)$|^8024$/
+      end
+      # If we have lines to skip do this until we reach and empty line
+      if skip_block
+        skip_block = false if /\S/ !~ line
+        next
+      end
+      out << line.strip
+    end
+    out = comment out.join "\n"
+    out << "\n"
+  end
+
+
 end

data/lib/oxidized/model/routeros.rb

@@ -0,0 +1,17 @@
+class RouterOS < Oxidized::Model
+  prompt /^\[\w+@\S+\]\s?>\s?$/
+  comment "# "
+
+  cmd '/system routerboard print' do |cfg|
+    comment cfg
+  end
+
+  cmd '/export' do |cfg|
+    cfg = cfg.split("\n").select { |line| not line[/^\#\s\w{3}\/\d{2}\/\d{4}.*$/] }
+    cfg.join("\n") + "\n"
+  end
+
+  cfg :ssh do
+    exec true
+  end
+end

data/lib/oxidized/output/git.rb

@@ -99,6 +99,7 @@ class Git < Output
         :parents    => repo.empty? ? [] : [repo.head.target].compact,
         :update_ref => 'HEAD',
       )
+      index.write
     end
   end
 end

data/oxidized.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'oxidized'
-  s.version           = '0.4.1'
+  s.version           = '0.5.0'
   s.licenses          = %w( Apache-2.0 )
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti', 'Samer Abdel-Hafez' ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus
@@ -84,6 +84,8 @@ files:
 - bin/oxidized
 - extra/nagios_check_failing_nodes.rb
 - extra/oxidized.init
+- extra/oxidized.supervisord
+- extra/oxidized.upstart
 - extra/rest_client.rb
 - extra/syslog.rb
 - lib/oxidized.rb
@@ -123,6 +125,7 @@ files:
 - lib/oxidized/model/outputs.rb
 - lib/oxidized/model/powerconnect.rb
 - lib/oxidized/model/procurve.rb
+- lib/oxidized/model/routeros.rb
 - lib/oxidized/model/screenos.rb
 - lib/oxidized/model/timos.rb
 - lib/oxidized/model/vrp.rb