summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorytti <saku@ytti.fi>2017-07-01 11:34:57 +0300
committerGitHub <noreply@github.com>2017-07-01 11:34:57 +0300
commit04058a68b824764b3dfb62594393d2441c79daaf (patch)
treeb4602746881302cc475f6497b0f8afc3ce3bf9d5 /lib
parentf120db942d2c2fa06077da847ead810f27cb7bb2 (diff)
parentc813007a8c1414c70f13e7cfd243ae1334541929 (diff)
Merge pull request #886 from Punicaa/master
Fixes for Brocade ADX loadbalancers
Diffstat (limited to 'lib')
-rw-r--r--lib/oxidized/model/ironware.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/oxidized/model/ironware.rb b/lib/oxidized/model/ironware.rb
index 9715c65..3ab8da1 100644
--- a/lib/oxidized/model/ironware.rb
+++ b/lib/oxidized/model/ironware.rb
@@ -34,6 +34,8 @@ class IronWare < Oxidized::Model
cfg.gsub! /(^((.*)Current temp(.*))$)/, '' #remove unwanted lines current temperature
cfg.gsub! /Speed = [A-Z-]{2,6} \(\d{2,3}\%\)/, '' #remove unwanted lines Speed Fans
cfg.gsub! /current speed is [A-Z]{2,6} \(\d{2,3}\%\)/, ''
+ cfg.gsub! /Fan \d* - STATUS: OK \D*\d*./, '' # Fix for ADX Fan speed reporting
+ cfg.gsub! /\d* deg C/, '' # Fix for ADX temperature reporting
cfg.gsub! /([\[]*)1([\]]*)<->([\[]*)2([\]]*)(<->([\[]*)3([\]]*))*/, ''
cfg.gsub! /\d{2}\.\d deg-C/, 'XX.X deg-C'
if cfg.include? "TEMPERATURE"
@@ -50,6 +52,7 @@ class IronWare < Oxidized::Model
end
cmd 'show flash' do |cfg|
+ cfg.gsub! /(\d+) bytes/, '' # Fix for ADX flash size
comment cfg
end