From 4961d47d70231de74b2a94b52b8435e612213f5b Mon Sep 17 00:00:00 2001
From: Colin Stubbs <colin.stubbs@equatetechnologies.com.au>
Date: Fri, 8 Apr 2016 20:35:21 +1000
Subject: Fix for issue 359

---
 lib/oxidized/model/tmos.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/oxidized/model/tmos.rb b/lib/oxidized/model/tmos.rb
index abaec9f..3570015 100644
--- a/lib/oxidized/model/tmos.rb
+++ b/lib/oxidized/model/tmos.rb
@@ -10,11 +10,11 @@ class TMOS < Oxidized::Model
     cfg
   end
 
-  cmd('tmsh show sys version') { |cfg| comment cfg }
+  cmd('tmsh -q show sys version') { |cfg| comment cfg }
 
-  cmd('tmsh show sys software') { |cfg| comment cfg }
+  cmd('tmsh -q show sys software') { |cfg| comment cfg }
 
-  cmd 'tmsh show sys hardware field-fmt' do |cfg|
+  cmd 'tmsh -q show sys hardware field-fmt' do |cfg|
     cfg.gsub!(/fan-speed (\S+)/, '')
     cfg.gsub!(/temperature (\S+)/, '')
     comment cfg
-- 
cgit v1.2.1


From 5bce86bfe86e4b22740f92568312498fde9104b3 Mon Sep 17 00:00:00 2001
From: Colin Stubbs <cstubbs@gmail.com>
Date: Fri, 8 Apr 2016 20:50:23 +1000
Subject: Fix for issue ytti/382, filters out additional credentials/secrets
 which change regularly in some way. Tested with BIG-IP v11.6.1

---
 lib/oxidized/model/tmos.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/oxidized/model/tmos.rb b/lib/oxidized/model/tmos.rb
index 3570015..390046d 100644
--- a/lib/oxidized/model/tmos.rb
+++ b/lib/oxidized/model/tmos.rb
@@ -3,10 +3,12 @@ class TMOS < Oxidized::Model
   comment  '# '
 
   cmd :secret do |cfg|
-    cfg.gsub!(/password (\S+)/, 'password <secret removed>')
-    cfg.gsub!(/passphrase (\S+)/, 'passphrase <secret removed>')
-    cfg.gsub!(/community (\S+)/, 'community <secret removed>')
-    cfg.gsub!(/community-name (\S+)/, 'community-name <secret removed>')
+    cfg.gsub!(/^([\s\t]*)secret \S+/, '\1secret <secret removed>')
+    cfg.gsub!(/^([\s\t]*\S*)password \S+/, '\1password <secret removed>')
+    cfg.gsub!(/^([\s\t]*\S*)passphrase \S+/, '\1passphrase <secret removed>')
+    cfg.gsub!(/community \S+/, 'community <secret removed>')
+    cfg.gsub!(/community-name \S+/, 'community-name <secret removed>')
+    cfg.gsub!(/^([\s\t]*\S*)encrypted \S+$/, '\1encrypted <secret removed>')
     cfg
   end
 
-- 
cgit v1.2.1