oxidized 0.9.0 → 0.10.0

data/lib/oxidized/model/model.rb

@@ -11,7 +11,8 @@ module Oxidized
         klass.instance_variable_set '@cfg',   Hash.new { |h,k| h[k] = [] }
         klass.instance_variable_set '@procs', Hash.new { |h,k| h[k] = [] }
         klass.instance_variable_set '@expect', []
-        klass.const_set :CFG, CFG
+        klass.instance_variable_set '@comment', nil
+        klass.instance_variable_set '@prompt', nil
       end
       def comment _comment='# '
         return @comment if @comment
@@ -78,7 +79,7 @@ module Oxidized
     attr_accessor :input, :node
 
     def cmd string, &block
-      out = @input.cmd string
+      out = "====================== #{string} ======================\n" + @input.cmd(string)
       return false unless out
       self.class.cmds[:all].each do |all_block|
         out = instance_exec Oxidized::String.new(out), string, &all_block

data/lib/oxidized/model/powerconnect.rb

@@ -14,6 +14,9 @@ class PowerConnect < Oxidized::Model
   end
 
   cmd 'show version' do |cfg|
+    if (@stackable.nil?)
+      @stackable = true if cfg.match /(U|u)nit\s/
+    end
     cfg = cfg.split("\n").select { |line| not line[/Up\sTime/] }
     comment cfg.join("\n") + "\n"
   end
@@ -47,15 +50,17 @@ class PowerConnect < Oxidized::Model
 
   def clean cfg
     out = []
-    skip_block = false
+    skip_blocks = 0
     cfg.each_line do |line|
-      if line.match /Up\sTime|Temperature|Power Supplies/i
-        # For 34xx, 35xx, 54xx, 55xx, 62xx 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)$|^(62)(24|48)$|^8024$/
+      # If this is a stackable switch we should skip this block of information
+      if (line.match /Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i and @stackable == true)
+        skip_blocks = 1
+        # Some switches have another empty line. This is identified by this line having a colon
+        skip_blocks = 2 if line.match /:/
       end
       # If we have lines to skip do this until we reach and empty line
-      if skip_block
-        skip_block = false if /\S/ !~ line
+      if skip_blocks > 0
+        skip_blocks -= 1 if /\S/ !~ line
         next
       end
       out << line.strip

data/lib/oxidized/model/saos.rb

@@ -0,0 +1,24 @@
+class SAOS < Oxidized::Model
+
+  # Ciena SAOS switch
+  # used for 6.x devices
+ 
+  comment  '! '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd 'configuration show' do |cfg|
+    cfg
+  end
+
+  cfg :telnet do
+    username /login:/
+    password /assword:/
+  end
+  cfg :telnet do
+    post_login 'system shell session set more off'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/node.rb

@@ -5,10 +5,13 @@ module Oxidized
   class MethodNotFound < OxidizedError; end
   class ModelNotFound  < OxidizedError; end
   class Node
-    attr_reader :name, :ip, :model, :input, :output, :group, :auth, :prompt, :vars, :last
+    attr_reader :name, :ip, :model, :input, :output, :group, :auth, :prompt, :vars, :last, :repo
     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
       @name           = opt[:name]
       @ip             = IPAddr.new(opt[:ip]).to_s rescue nil
       @ip           ||= Resolv.new.getaddress @name
@@ -21,6 +24,7 @@ module Oxidized
       @vars           = opt[:vars]
       @stats          = Stats.new
       @retry          = 0
+      @repo           = Oxidized.config.output.git.repo
 
       # model instance needs to access node instance
       @model.node = self
@@ -54,9 +58,7 @@ module Oxidized
         end
       end
       begin
-        if input.connect self
-          input.get
-        end
+        input.connect(self) and input.get
       rescue *rescue_fail.keys => err
         resc  = ''
         if not level = rescue_fail[err.class]
@@ -64,7 +66,7 @@ module Oxidized
           level = rescue_fail[resc]
           resc  = " (rescued #{resc})"
         end
-        Log.send(level, '%s raised %s%s with msg "%s"' % [self.ip, err.class, resc, err.message])
+        Oxidized.logger.send(level, '%s raised %s%s with msg "%s"' % [self.ip, err.class, resc, err.message])
         return false
       rescue => err
         file = Oxidized::Config::Crash + '.' + self.ip.to_s
@@ -74,7 +76,7 @@ module Oxidized
           fh.puts '-' * 50
           fh.puts err.backtrace
         end
-        Log.error '%s raised %s with msg "%s", %s saved' % [self.ip, err.class, err.message, file]
+        Oxidized.logger.error '%s raised %s with msg "%s", %s saved' % [self.ip, err.class, err.message, file]
         return false
       end
     end
@@ -122,19 +124,17 @@ module Oxidized
     private
 
     def resolve_prompt opt
-      prompt =   opt[:prompt]
-      prompt ||= @model.prompt
-      prompt ||= CFG.prompt
+      opt[:prompt] || @model.prompt || Oxidized.config.prompt
     end
 
     def resolve_auth opt
       # Resolve configured username/password, give priority to group level configuration
       # TODO: refactor to use revised behaviour of Asetus
       cfg_username, cfg_password =
-        if CFG.groups.has_key?(@group) and ['username', 'password'].all? {|e| CFG.groups[@group].has_key?(e)}
-          [CFG.groups[@group].username, CFG.groups[@group].password]
-        elsif ['username', 'password'].all? {|e| CFG.has_key?(e)}
-          [CFG.username, CFG.password]
+        if Oxidized.config.groups.has_key?(@group) and ['username', 'password'].all? {|e| Oxidized.config.groups[@group].has_key?(e)}
+          [Oxidized.config.groups[@group].username, Oxidized.config.groups[@group].password]
+        elsif ['username', 'password'].all? {|e| Oxidized.config.has_key?(e)}
+          [Oxidized.config.username, Oxidized.config.password]
         else
           [nil, nil]
         end
@@ -145,7 +145,7 @@ module Oxidized
     end
 
     def resolve_input opt
-      inputs = (opt[:input]  or CFG.input.default)
+      inputs = (opt[:input]  or Oxidized.config.input.default)
       inputs.split(/\s*,\s*/).map do |input|
         if not Oxidized.mgr.input[input]
           Oxidized.mgr.add_input input or raise MethodNotFound, "#{input} not found for node #{ip}"
@@ -155,7 +155,7 @@ module Oxidized
     end
 
     def resolve_output opt
-      output = (opt[:output] or CFG.output.default)
+      output = (opt[:output] or Oxidized.config.output.default)
       if not Oxidized.mgr.output[output]
         Oxidized.mgr.add_output output or raise MethodNotFound, "#{output} not found for node #{ip}"
       end
@@ -163,7 +163,7 @@ module Oxidized
     end
 
     def resolve_model opt
-      model = (opt[:model] or CFG.model)
+      model = (opt[:model] or Oxidized.config.model)
       if not Oxidized.mgr.model[model]
         Oxidized.mgr.add_model model or raise ModelNotFound, "#{model} not found for node #{ip}"
       end

data/lib/oxidized/nodes.rb

@@ -1,15 +1,15 @@
 module Oxidized
- require 'ipaddr'
- require 'oxidized/node'
- class Oxidized::NotSupported < OxidizedError; end
- class Oxidized::NodeNotFound < OxidizedError; end
+  require 'ipaddr'
+  require 'oxidized/node'
+  class Oxidized::NotSupported < OxidizedError; end
+  class Oxidized::NodeNotFound < OxidizedError; end
   class Nodes < Array
     attr_accessor :source
     alias :put :unshift
     def load node_want=nil
       with_lock do
         new = []
-        @source = CFG.source.default
+        @source = Oxidized.config.source.default
         Oxidized.mgr.add_source @source
         Oxidized.mgr.source[@source].new.load.each do |node|
           # we want to load specific node(s), not all of them
@@ -18,13 +18,13 @@ module Oxidized
             _node = Node.new node
             new.push _node
           rescue ModelNotFound => err
-            Log.error "node %s raised %s with message '%s'" % [node, err.class, err.message]
+            Oxidized.logger.error "node %s raised %s with message '%s'" % [node, err.class, err.message]
           rescue Resolv::ResolvError => err
-            Log.error "node %s is not resolvable, raised %s with message '%s'" % [node, err.class, err.message]
+            Oxidized.logger.error "node %s is not resolvable, raised %s with message '%s'" % [node, err.class, err.message]
           end
         end
         size == 0 ? replace(new) : update_nodes(new)
-	Log.info "Loaded #{size} nodes"
+        Oxidized.logger.info "Loaded #{size} nodes"
       end
     end
 
@@ -148,9 +148,9 @@ module Oxidized
         end
       end
     end
-    
+
     public
-    
+
     def version node, group
       with_lock do
         i = find_node_index node
@@ -159,7 +159,7 @@ module Oxidized
         output.version node, group
       end
     end
-    
+
     def get_version node, group, oid
       with_lock do
         i = find_node_index node
@@ -168,7 +168,7 @@ module Oxidized
         output.get_version node, group, oid
       end
     end
-    
+
     def get_diff node, group, oid1, oid2
       with_lock do
         i = find_node_index node

data/lib/oxidized/output/file.rb

@@ -2,14 +2,16 @@ module Oxidized
 class OxidizedFile < Output
   require 'fileutils'
 
+  attr_reader :commitref
+
   def initialize
-    @cfg = CFG.output.file
+    @cfg = Oxidized.config.output.file
   end
 
   def setup
     if @cfg.empty?
-      CFGS.user.output.file.directory = File.join(Config::Root, 'configs')
-      CFGS.save :user
+      Oxidized.asetus.user.output.file.directory = File.join(Config::Root, 'configs')
+      Oxidized.asetus.save :user
       raise NoConfig, 'no output file config, edit ~/.config/oxidized/config'
     end
   end
@@ -22,6 +24,7 @@ class OxidizedFile < Output
     FileUtils.mkdir_p file
     file = File.join file, node
     open(file, 'w') { |fh| fh.write outputs.to_cfg }
+    @commitref = file
   end
 
   def fetch node, group
@@ -39,5 +42,14 @@ class OxidizedFile < Output
     end
   end
 
+  def version node, group
+    # not supported
+    []
+  end
+
+  def get_version node, group, oid
+    'not supported'
+  end
+
 end
 end

data/lib/oxidized/output/git.rb

@@ -7,16 +7,18 @@ class Git < Output
     raise OxidizedError, 'rugged not found: sudo gem install rugged'
   end
 
+  attr_reader :commitref
+
   def initialize
-    @cfg = CFG.output.git
+    @cfg = Oxidized.config.output.git
   end
 
   def setup
     if @cfg.empty?
-      CFGS.user.output.git.user  = 'Oxidized'
-      CFGS.user.output.git.email = 'o@example.com'
-      CFGS.user.output.git.repo  =  File.join(Config::Root, 'oxidized.git')
-      CFGS.save :user
+      Oxidized.asetus.user.output.git.user  = 'Oxidized'
+      Oxidized.asetus.user.output.git.email = 'o@example.com'
+      Oxidized.asetus.user.output.git.repo  =  File.join(Config::Root, 'oxidized.git')
+      Oxidized.asetus.save :user
       raise NoConfig, 'no output git config, edit ~/.config/oxidized/config'
     end
     @cfg.repo = File.expand_path @cfg.repo
@@ -27,6 +29,7 @@ class Git < Output
     @user  = (opt[:user]  or @cfg.user)
     @email = (opt[:email] or @cfg.email)
     @opt   = opt
+    @commitref = nil
     repo   = @cfg.repo
 
     outputs.types.each do |type|
@@ -63,7 +66,7 @@ class Git < Output
     end
   end
 
-  #give a hash of all oid revision for the givin node, and the date of the commit
+  #give a hash of all oid revision for the given node, and the date of the commit
     def version node, group
       begin
         repo = @cfg.repo
@@ -176,7 +179,7 @@ class Git < Output
     if tree_old != tree_new
       repo.config['user.name']  = user
       repo.config['user.email'] = email
-      Rugged::Commit.create(repo,
+      @commitref = Rugged::Commit.create(repo,
         :tree       => index.write_tree(repo),
         :message    => msg,
         :parents    => repo.empty? ? [] : [repo.head.target].compact,

data/lib/oxidized/source/csv.rb

@@ -1,17 +1,17 @@
 module Oxidized
 class CSV < Source
   def initialize
-    @cfg = CFG.source.csv
+    @cfg = Oxidized.config.source.csv
     super
   end
 
   def setup
     if @cfg.empty?
-      CFGS.user.source.csv.file      = File.join(Config::Root, 'router.db')
-      CFGS.user.source.csv.delimiter = /:/
-      CFGS.user.source.csv.map.name  = 0
-      CFGS.user.source.csv.map.model = 1
-      CFGS.save :user
+      Oxidized.asetus.user.source.csv.file      = File.join(Config::Root, 'router.db')
+      Oxidized.asetus.user.source.csv.delimiter = /:/
+      Oxidized.asetus.user.source.csv.map.name  = 0
+      Oxidized.asetus.user.source.csv.map.model = 1
+      Oxidized.asetus.save :user
       raise NoConfig, 'no source csv config, edit ~/.config/oxidized/config'
     end
   end
@@ -19,7 +19,7 @@ class CSV < Source
   def load
     nodes = []
     open(File.expand_path @cfg.file).each_line do |line|
-      next if line.match /^\s*#/
+      next if line.match(/^\s*#/)
       data  = line.chomp.split @cfg.delimiter
       next if data.empty?
       # map node parameters

data/lib/oxidized/source/http.rb

@@ -1,7 +1,7 @@
 module Oxidized
 class HTTP < Source
   def initialize
-    @cfg = CFG.source.http
+    @cfg = Oxidized.config.source.http
     super
   end
 

data/lib/oxidized/source/source.rb

@@ -2,7 +2,7 @@ module Oxidized
   class Source
     class NoConfig < OxidizedError; end
     def initialize
-      @map = (CFG.model_map or {})
+      @map = (Oxidized.config.model_map or {})
     end
     def map_model model
       @map.has_key?(model) ? @map[model] : model

data/lib/oxidized/source/sql.rb

@@ -8,12 +8,12 @@ class SQL < Source
 
   def setup
     if @cfg.empty?
-      CFGS.user.source.sql.adapter   = 'sqlite'
-      CFGS.user.source.sql.database  = File.join(Config::Root, 'sqlite.db')
-      CFGS.user.source.sql.table     = 'devices'
-      CFGS.user.source.sql.map.name  = 'name'
-      CFGS.user.source.sql.map.model = 'rancid'
-      CFGS.save :user
+      Oxidized.asetus.user.source.sql.adapter   = 'sqlite'
+      Oxidized.asetus.user.source.sql.database  = File.join(Config::Root, 'sqlite.db')
+      Oxidized.asetus.user.source.sql.table     = 'devices'
+      Oxidized.asetus.user.source.sql.map.name  = 'name'
+      Oxidized.asetus.user.source.sql.map.model = 'rancid'
+      Oxidized.asetus.save :user
       raise NoConfig, 'no source sql config, edit ~/.config/oxidized/config'
     end
   end
@@ -44,7 +44,7 @@ class SQL < Source
 
   def initialize
     super
-    @cfg = CFG.source.sql
+    @cfg = Oxidized.config.source.sql
   end
 
   def connect

data/lib/oxidized/string.rb

@@ -16,7 +16,7 @@ module Oxidized
     # sets @cmd and @name unless @name is already set
     def set_cmd command
       @cmd  = command
-      @name = @cmd.strip.gsub(/\s+/, '_') if @name == nil
+      @name ||= @cmd.strip.gsub(/\s+/, '_')
     end
 
     def initialize str=''

data/lib/oxidized/version.rb

@@ -0,0 +1,3 @@
+module Oxidized
+  VERSION = '0.10.0'
+end

data/lib/oxidized/worker.rb

@@ -4,7 +4,7 @@ module Oxidized
   class Worker
     def initialize nodes
       @nodes   = nodes
-      @jobs    = Jobs.new CFG.threads, CFG.interval, @nodes
+      @jobs    = Jobs.new(Oxidized.config.threads, Oxidized.config.interval, @nodes)
       Thread.abort_on_exception = true
     end
 
@@ -14,11 +14,11 @@ module Oxidized
       ended.each      { |job| process job }
       @jobs.work
       while @jobs.size < @jobs.want
-        Log.debug "Jobs #{@jobs.size}, Want: #{@jobs.want}"
+        Oxidized.logger.debug "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 + CFG.interval > Time.now.utc
+          break if nextnode.last.end + Oxidized.config.interval > Time.now.utc
         end
         # shift nodes and get the next node
         node = @nodes.get
@@ -39,16 +39,18 @@ module Oxidized
         msg = "update #{node.name}"
         msg += " from #{node.from}" if node.from
         msg += " with message '#{node.msg}'" if node.msg
-        if node.output.new.store node.name, job.config,
+        output = node.output.new
+        if output.store node.name, job.config,
                               :msg => msg, :user => node.user, :group => node.group
-          Log.info "Configuration updated for #{node.group}/#{node.name}"
+          Oxidized.logger.info "Configuration updated for #{node.group}/#{node.name}"
           Oxidized.Hooks.handle :post_store, :node => node,
-                                             :job => job
+                                             :job => job,
+                                             :commitref => output.commitref
         end
         node.reset
       else
         msg = "#{node.name} status #{job.status}"
-        if node.retry < CFG.retries
+        if node.retry < Oxidized.config.retries
           node.retry += 1
           msg += ", retry attempt #{node.retry}"
           @nodes.next node.name
@@ -58,10 +60,10 @@ module Oxidized
           Oxidized.Hooks.handle :node_fail, :node => node,
                                             :job => job
         end
-        Log.warn msg
+        Oxidized.logger.warn msg
       end
     rescue NodeNotFound
-      Log.warn "#{node.name} not found, removed while collecting?"
+      Oxidized.logger.warn "#{node.name} not found, removed while collecting?"
     end
 
   end