summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/oxidized/model/ironware.rb5
-rw-r--r--lib/oxidized/output/git.rb3
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/oxidized/model/ironware.rb b/lib/oxidized/model/ironware.rb
index ad795d5..805e07b 100644
--- a/lib/oxidized/model/ironware.rb
+++ b/lib/oxidized/model/ironware.rb
@@ -1,6 +1,6 @@
class IronWare < Oxidized::Model
- prompt /^.+[>#]\s?$/
+ prompt /^.*(telnet|ssh)\@.+[>#]\s?$/i
comment '! '
#to handle pager without enable
@@ -32,7 +32,7 @@ class IronWare < Oxidized::Model
end
cmd 'show chassis' do |cfg|
- cfg.gsub! /\xFF/n, '' # ugly hack - avoids JSON.dump utf-8 breakage on 1.9..
+ 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}\%\)/, ''
@@ -71,6 +71,7 @@ class IronWare < Oxidized::Model
send vars(:enable) + "\n"
end
end
+ post_login ''
post_login 'skip-page-display'
post_login 'terminal length 0'
pre_logout 'logout'
diff --git a/lib/oxidized/output/git.rb b/lib/oxidized/output/git.rb
index e568a58..3757cfc 100644
--- a/lib/oxidized/output/git.rb
+++ b/lib/oxidized/output/git.rb
@@ -19,6 +19,7 @@ class Git < Output
CFGS.save :user
raise NoConfig, 'no output git config, edit ~/.config/oxidized/config'
end
+ @cfg.repo = File.expand_path @cfg.repo
end
def store file, outputs, opt={}
@@ -26,7 +27,7 @@ class Git < Output
@user = (opt[:user] or @cfg.user)
@email = (opt[:email] or @cfg.email)
@opt = opt
- repo = File.expand_path @cfg.repo
+ repo = @cfg.repo
outputs.types.each do |type|
type_cfg = ''