From 3836597f38d7dd34ac164857e317560af4206fd1 Mon Sep 17 00:00:00 2001 From: Thane Gill Date: Fri, 9 Feb 2018 12:41:39 -0800 Subject: model: AWOS Make the space between # mandatory rather than optional in the prompt. (#1182) Per discussion in #1000 --- lib/oxidized/model/aosw.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/oxidized/model/aosw.rb b/lib/oxidized/model/aosw.rb index a85ead7..71fde2e 100644 --- a/lib/oxidized/model/aosw.rb +++ b/lib/oxidized/model/aosw.rb @@ -11,7 +11,7 @@ class AOSW < Oxidized::Model # All IAPs connected to a Instant Controller will have the same config output. Only the controller needs to be monitored. comment '# ' - prompt /^\(?.+\)?\s?[#>]/ + prompt /^\(?.+\)?\s[#>]/ cmd :all do |cfg| cfg.each_line.to_a[1..-2].join -- cgit v1.2.3 From 6bc570a7d6626eaf65fa718d3d364f77b85322a5 Mon Sep 17 00:00:00 2001 From: Charlie Allom Date: Sat, 10 Feb 2018 20:41:28 +0000 Subject: fix: Fixed docker build (#1181) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 49ebb6e..e72a449 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER Samer Abdel-Hafez RUN add-apt-repository ppa:brightbox/ruby-ng && \ apt-get update && \ - apt-get install -y ruby2.3 ruby2.3-dev libsqlite3-dev libssl-dev pkg-config make cmake libssh2-1-dev git g++ + apt-get install -y ruby2.3 ruby2.3-dev libsqlite3-dev libssl-dev pkg-config make cmake libssh2-1-dev git g++ libffi-dev RUN mkdir -p /tmp/oxidized COPY . /tmp/oxidized/ -- cgit v1.2.3 From a9e5eed60b687b4a488eb1d11b5147e9f932c6fa Mon Sep 17 00:00:00 2001 From: Dave Date: Sat, 10 Feb 2018 17:10:23 -0500 Subject: mode: Procurve model add show commands (#1176) Sanitized output: ``` Power Supply Status: PS# Model State AC/DC + V Wattage ---- --------- ------------- ----------------- --------- 1 Unknwn Powered AC 220V 1500 2 Unknwn Powered AC 220V 1500 2 / 2 supply bays delivering power. Total power: 3000 W ``` Of course you see `unknwn` but that is addressed in latest firmware release. Thanks! --- lib/oxidized/model/procurve.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/oxidized/model/procurve.rb b/lib/oxidized/model/procurve.rb index 11d7ea9..444fb5b 100644 --- a/lib/oxidized/model/procurve.rb +++ b/lib/oxidized/model/procurve.rb @@ -47,6 +47,10 @@ class Procurve < Oxidized::Model comment cfg end + cmd 'show system power-supply' do |cfg| + comment cfg + end + cmd 'show interfaces transceiver' do |cfg| comment cfg end -- cgit v1.2.3 From cc78c8143cc167a14f1d45755a83242fae0af1b2 Mon Sep 17 00:00:00 2001 From: Neil Lathwood Date: Thu, 15 Feb 2018 19:40:26 +0000 Subject: docs: Added model note for 3com comware (#1186) --- docs/Model-Notes/Comware.md | 10 ++++++++++ docs/Model-Notes/README.md | 1 + 2 files changed, 11 insertions(+) create mode 100644 docs/Model-Notes/Comware.md diff --git a/docs/Model-Notes/Comware.md b/docs/Model-Notes/Comware.md new file mode 100644 index 0000000..31eb002 --- /dev/null +++ b/docs/Model-Notes/Comware.md @@ -0,0 +1,10 @@ +Comware Configuration +===================== + +If you find 3Com comware devices aren't being backed up this may be due to prompt detection not matching +because a previous login message is disabled after the first prompt. You can disable this on the devices +themselves by running this command: + +`info-center source default channel 1 log state off debug state off` + +[Reference](https://github.com/ytti/oxidized/issues/1171) diff --git a/docs/Model-Notes/README.md b/docs/Model-Notes/README.md index f51ed80..6a64058 100644 --- a/docs/Model-Notes/README.md +++ b/docs/Model-Notes/README.md @@ -11,6 +11,7 @@ Use the table below for more information on the Vendor/Model caveats. Vendor | Model |Updated ----------------|-----------------|---------------- +3COM|[Comware](Comware.md)|15 Feb 2018 Huawei|[VRP](VRP-Huawei.md)|17 Nov 2017 Juniper|[MX/QFX/EX/SRX/J Series](JunOS.md)|18 Jan 2018 Xyzel|[XGS4600 Series](XGS4600-Zyxel.md)|23 Jan 2018 -- cgit v1.2.3 From a42d1bad82e37975d674b560b18bc153a2786669 Mon Sep 17 00:00:00 2001 From: dhooper6430 Date: Wed, 21 Feb 2018 17:25:49 +0800 Subject: model: Update br6910 model prompt detection (#1188) The BR6910 switch can be configured to display anything on the prompt, by default it's vty-, I have modified the prompt statement to allow for whatever the user has configured the prompt to be. --- lib/oxidized/model/br6910.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/oxidized/model/br6910.rb b/lib/oxidized/model/br6910.rb index b5c9bcf..df93793 100644 --- a/lib/oxidized/model/br6910.rb +++ b/lib/oxidized/model/br6910.rb @@ -1,7 +1,7 @@ class BR6910 < Oxidized::Model - prompt /^Vty-[0-9]\#$/ + prompt /^([\w.@()-]+[#>]\s?)$/ comment '! ' # not possible to disable paging prior to show running-config -- cgit v1.2.3