oxidized 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed89ca2526da5f8b5ce7d70ca01defd3f25a7496
-  data.tar.gz: 1251b2a7d1b49ba9c8205b609b666c118cb28256
+  metadata.gz: c94960c6cdf5ebe4dc6910df211a29a55e3e3ecd
+  data.tar.gz: 9f8a27d266ac4e52519017bce1502df6b87fe802
 SHA512:
-  metadata.gz: 2b7d1efbce64744b04a37b6dc9c8ba3614879d9f6ff119021afac2d4c6a0ad7411a47c2efe1ee4bb1ad22e777c2122146a89b9873adbe5a90eeb8b5994d7c3c2
-  data.tar.gz: 5e9d0c55b77cb7e8306c150067e6408d1dfdd8bc10451fc8c75c56d46cf719a32b474d7cbb6cab7b5f4e9119cfc58ae040a5b93d720e92a0333eba40196ed71b
+  metadata.gz: 1e005677f0702e5538645a4489ec4e123dad5ffc88386dc9186053e0db6f08c0321db0df1e945b84d5bb57cecf92c750a25eb3d1b82970496c8fa423f70be083
+  data.tar.gz: 16b8495f91c14040ca26c7f5028250a23ffa54aa7268ea5420ced503ef9fd4027ec46e959801854f44ca03f4cee64fdbd2fa787dca4a6decc69e8e9833a24931

data/README.md

@@ -2,7 +2,7 @@
 
 [![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!
+Oxidized is a network device configuration backup tool. It's a RANCID replacement!
 
 * automatically adds/removes threads to meet configured retrieval interval
 * restful API to move node immediately to head-of-queue (GET/POST /node/next/[NODE])

data/extra/oxidized.service

@@ -0,0 +1,12 @@
+#For debian 8 put it in /lib/systemd/system/
+#and call it with systemctl start oxidized.service
+
+[Unit]
+Description=Oxidized - Network Device Configuration Backup Tool
+
+[Service]
+ExecStart=/usr/local/bin/oxidized
+User=root
+
+[Install]
+WantedBy=multi-user.target

data/lib/oxidized/input/ssh.rb

@@ -24,7 +24,7 @@ module Oxidized
       @ssh = Net::SSH.start @node.ip, @node.auth[:username],
                             :password => @node.auth[:password], :timeout => CFG.timeout,
                             :paranoid => secure,
-                            :auth_methods => %w(none publickey password),
+                            :auth_methods => %w(none publickey password keyboard-interactive),
                             :number_of_password_prompts => 0
       unless @exec
         shell_open @ssh

data/lib/oxidized/model/ironware.rb

@@ -25,13 +25,28 @@ class IronWare < Oxidized::Model
   end
 
   cmd 'show version' do |cfg|
-    cfg.gsub! /(^((.*)system uptime(.*))$)/, '' #remove unwanted line system uptime
+    cfg.gsub! /(^((.*)[Ss]ystem uptime(.*))$)/, '' #remove unwanted line system uptime
+    cfg.gsub! /uptime is .*/,''
+
     comment cfg
   end
 
   cmd 'show chassis' do |cfg|
-    cfg.gsub! "\xFF", '' # ugly hack - avoids JSON.dump utf-8 breakage on 1.9..
+    cfg.gsub! /\xFF/n, '' # ugly hack - avoids JSON.dump utf-8 breakage on 1.9..
     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! /Fan controlled temperature: \d{2}\.\d deg-C/, 'Fan controlled temperature: XX.X d deg-C'
+    if cfg.include? "TEMPERATURE"
+      sc = StringScanner.new cfg
+      out = ''
+      temps = ''
+      out << sc.scan_until(/.*TEMPERATURE/)
+      temps << sc.scan_until(/.*Fans/)
+      out << sc.rest
+      cfg = out
+    end
+    
     comment cfg
   end
   

data/lib/oxidized/nodes.rb

@@ -148,6 +148,35 @@ module Oxidized
         end
       end
     end
+    
+    public
+    
+    def version node, group
+      with_lock do
+        i = find_node_index node
+        output = self[i].output.new
+        raise Oxidized::NotSupported unless output.respond_to? :fetch
+        output.version node, group
+      end
+    end
+    
+    def get_version node, group, oid
+      with_lock do
+        i = find_node_index node
+        output = self[i].output.new
+        raise Oxidized::NotSupported unless output.respond_to? :fetch
+        output.get_version node, group, oid
+      end
+    end
+    
+    def get_diff node, group, oid1, oid2
+      with_lock do
+        i = find_node_index node
+        output = self[i].output.new
+        raise Oxidized::NotSupported unless output.respond_to? :fetch
+        output.get_diff node, group, oid1, oid2
+      end
+    end
 
   end
 end

data/lib/oxidized/output/git.rb

@@ -61,6 +61,81 @@ class Git < Output
       'node not found'
     end
   end
+  
+  #give a hash of all oid revision for the givin node, and the date of the commit
+    def version node, group
+      begin
+        repo = @cfg.repo
+        if group
+          repo = File.join File.dirname(repo), group + '.git'
+        end
+        repo = Rugged::Repository.new repo  
+        walker = Rugged::Walker.new(repo)
+        walker.sorting(Rugged::SORT_DATE)
+        walker.push(repo.head.target)
+        i = -1
+        tab  = []
+        walker.each do |commit|
+          if commit.diff(paths: [node]).size > 0
+            hash = {}
+            hash[:date] = commit.time.to_s 
+            hash[:oid] = commit.oid
+            tab[i += 1] = hash
+          end
+        end
+        walker.reset
+        tab
+      rescue
+        'node not found'
+      end
+    end
+    
+    #give the blob of a specific revision
+    def get_version node, group, oid
+      begin
+        repo = @cfg.repo
+        if group && group != ''
+          repo = File.join File.dirname(repo), group + '.git'
+        end
+        repo = Rugged::Repository.new repo 
+        repo.blob_at(oid,node).content
+      rescue
+        'version not found'
+      end
+    end
+    
+    #give a hash with the patch of a diff between 2 revision and the stats (added and deleted lines)
+    def get_diff node, group, oid1, oid2
+      begin
+        repo = @cfg.repo
+        diff_commits = nil
+        if group && group != ''
+          repo = File.join File.dirname(repo), group + '.git'
+        end
+        repo = Rugged::Repository.new repo 
+        commit = repo.lookup(oid1)
+        #if the second revision is precised 
+        if oid2 
+          commit_old = repo.lookup(oid2)
+          diff = repo.diff(commit_old, commit)
+          diff.each do |patch|
+            if /#{node}\s+/.match(patch.to_s.lines.first)
+              diff_commits = {:patch => patch.to_s, :stat => patch.stat}
+              break
+            end
+          end
+        #else gives the diffs between the first oid and his first parrent
+        else
+          stat = commit.parents[0].diff(commit).stat
+          stat = [stat[1],stat[2]]
+          patch = commit.parents[0].diff(commit).patch
+          diff_commits = {:patch => patch, :stat => stat}
+        end
+        diff_commits
+      rescue
+        'no diffs'
+      end
+    end
 
   private
 
@@ -104,8 +179,10 @@ class Git < Output
         :parents    => repo.empty? ? [] : [repo.head.target].compact,
         :update_ref => 'HEAD',
       )
+      
       index.write
+      true
     end
   end
 end
-end
+end

data/lib/oxidized/worker.rb

@@ -37,8 +37,10 @@ module Oxidized
         msg = "update #{node.name}"
         msg += " from #{node.from}" if node.from
         msg += " with message '#{node.msg}'" if node.msg
-        node.output.new.store node.name, job.config,
+        if node.output.new.store node.name, job.config,
                               :msg => msg, :user => node.user, :group => node.group
+          Log.info "Configuration updated for #{node.group}/#{node.name}"
+        end
         node.reset
       else
         msg = "#{node.name} status #{job.status}"

data/oxidized.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'oxidized'
-  s.version           = '0.7.1'
+  s.version           = '0.7.2'
   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.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Saku Ytti
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus
@@ -90,6 +90,7 @@ files:
 - bin/oxidized
 - extra/nagios_check_failing_nodes.rb
 - extra/oxidized.init
+- extra/oxidized.service
 - extra/oxidized.supervisord
 - extra/oxidized.upstart
 - extra/rest_client.rb
@@ -173,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oxidized
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: feeble attempt at rancid