oxidized 0.30.1 → 0.32.0

data/docs/Model-Notes/APC_AOS.md

@@ -1,29 +1,42 @@
 # APC AOS Configuration
 
-Currently, the configuration of APC Network Management Cards can be downloaded with FTP only.
+The configuration of APC Network Management Cards can be downloaded using FTP
+and SCP.
+
+To download with SCP, you need a
+[patch](https://github.com/net-ssh/net-scp/pull/71) to
+[Net::SCP](https://github.com/net-ssh/net-scp, which has been included
+upstream, but there is currently no new release of Net::SCP and its authors are
+unresponsive.
+
+To temporarily solve this,
+[@robertcheramy forked Net::SCP](https://github.com/robertcheramy/net-scp). You
+can build or download the gem there. This gem is already included in the
+oxidized container image (in the release coming after 0.31.0).
 
-A download of the configuration with SCP is [work in progress](https://github.com/ytti/oxidized/issues/1802).
-As the APC has an unusual behavior (the connection is closed without an exit-status), this has to be
-[fixed](https://github.com/net-ssh/net-scp/pull/71) upstream in [Net::SCP](https://github.com/net-ssh/net-scp).
-As soon as there is a release of Net::SCP supporting the behavior of APC OS, we will activate SCP in oxidized.
 
 ## Can I collect more information than just the configuration?
-APC OS does not have the ability to show the config.ini within an SSH-session. As oxidized can only get the
-configuration with one input type at a time, it is not possible to fetch config.ini via FTP/SCP and get the output of
-some commands via SSH at the same time.
+APC OS does not have the ability to show the config.ini within an SSH-session.
+As oxidized can only get the configuration with one input type at a time, it is
+not possible to fetch config.ini via FTP/SCP and get the output of
+some commands via SSH at the same time. Feature request #3334 has been opened
+to support multiple inputs in oxidized.
+
+A ticket has been opened with APC support in order to enable "cat config.ini"
+within an SSH-session, but APC is not willing to support this.
 
-A ticket has been opened with APC support in order to support "cat config.ini" within an SSH-session, but
-the chances it will be supported at some time are not very good, and older versions will still not support it.
 
-## How do I activate FTP input?
-In order to download the configuration with FTP (and in the future with SCP), you have to activate it as an
-input in the oxidized configuration. If you do not activate the input, oxidized will fail for the node with
-a rather unspecific error (`WARN -- : /apc status fail, retry attempt 1`).
+## How do I activate FTP/SCP input?
+In order to download the configuration with FTP or SCP, you have to activate it
+as an input in the oxidized configuration. If you do not activate the input,
+oxidized will fail for the node with a
+[rather unspecific error](https://github.com/ytti/oxidized/issues/3346)
+(`WARN -- : /apc status fail, retry attempt 1`).
 
 The configuration can be done either globally or only for the model apc_aos.
 
-The global configuration would look like this. Note that Oxidized will try every input type in the given order
-until it succeeds, or it will report a failure.
+The global configuration would look like this. Note that Oxidized will try every
+input type in the given order until it succeeds, or it will report a failure.
 ```yaml
 input:
   default: ssh, ftp, scp

data/docs/Model-Notes/Cumulus.md

@@ -11,6 +11,9 @@ A variable has been added to enable users running Cumulus Linux > 3.4.0 to targe
 ## NCLU
 It is possible to switch to [NCLU](https://docs.nvidia.com/networking-ethernet-software/cumulus-linux-44/System-Configuration/Network-Command-Line-Utility-NCLU/) as a configuration collecting method, by setting `cumulus_use_nclu` to true
 
+## NVUE
+It is also possible to use [NVUE](https://docs.nvidia.com/networking-ethernet-software/knowledge-base/Setup-and-Getting-Started/NVUE-Cheat-Sheet/) as a configuration collecting method, by setting `cumulus_use_nvue` to true.
+
 ### Example usage
 
 ```yaml
@@ -43,4 +46,6 @@ The default value for `cumulus_routing_daemon` is `quagga` so existing installat
 
 The default value for `cumulus_use_nclu` is `false`, in case NCLU is not installed.
 
+The default value for `cumulus_use_nvue` is `false`, in case NVUE is not installed.
+
 Back to [Model-Notes](README.md)

data/docs/Model-Notes/FSOS.md

@@ -7,5 +7,11 @@ This has been tested against the following models and OS versions
 |S3400-48T4SP        |Version 2.0.2J Build 81736    |
 |S3400-48T4SP        |Version 2.0.2J Build 95262    |
 |S3400-48T6SP        |Version 2.2.0F Build 109661   |
+|S3400-48T4SP        |Version 2.0.2J Build 120538   |
+|S3410-24TS-P        |S3410_FSOS 11.4(1)B74S5       |
+|S5850-48T4Q         |Version 7.0.4.34              |
+|S5800-48MBQ         |Version 7.0.4.21              |
+|S5810-48TS-P        |S5810_FSOS 11.4(1)B74S8, Release(10200711)              |
+|S5860-20SQ          |S5860_FSOS 12.4(1)B0101P1S4   |
 
 Back to [Model-Notes](README.md)

data/docs/Model-Notes/FortiOS.md

@@ -1,18 +1,24 @@
 # FortiOS Configuration
 
-Create user oxidized with ED25519 public key
+## Create user oxidized with ED25519 public key
+You can use a user/password for retrieving the configuration or use a SSH public key:
 
 ```text
 config system admin
 edit oxidized
 set trusthost1 192.0.2.1 255.255.255.255
 set accprofile "super_admin_readonly"
-set ssh-public-key1 "ssh-ed25519 AAAAThisIsJustAnExmapleKey_UseYourOxidizedPUBLICKEY oxidized@librenms"
+set ssh-public-key1 "ssh-ed25519 AAAAThisIsJustAnExampleKey_UseYourOxidizedPUBLICKEY oxidized@librenms"
 end
 ```
 
 
-Fortigate procdues a lot of config changes. I recommend filtering using
+## Configuration changes / hiding passwords
+Fortigate reencrypts its passwords every time the configuration is shown.
+This produces a lot of config changes.
+If you don't want to have a new version every time the configuration is
+downloaded, you can hide all secrets. Beware that you won't have a full backup,
+as all passwords will be replaced with <configuration removed>
 
 ```yaml
 models:
@@ -21,8 +27,18 @@ models:
       remove_secret: true
 ```
 
+## config vs. full config
+On fortios, you can get a configuration without default values (`show .`) or
+including all the default values (`show full-configuration`).
 
+The full configuration can be quite long and produce time-outs.
+Beginning with oxidized 0.30.1, the default is to get the short configuration.
 
-Oxidized can now retrieve your configuration!
+If you need the full configuration, you can activate it in oxidized config file:
+```yaml
+models:
+  fortios:
+    vars:
+      fullconfig: true
+```
 
-Back to [Model-Notes](README.md)

data/docs/Model-Notes/HPEAruba.md

@@ -0,0 +1,31 @@
+# HPE Aruba Networking devices
+HPE Aruba offers various networking devices with different operating systems.
+
+## HPE Aruba Networking Instant Mode (Aruba Instant)
+[Aruba Instant](https://www.arubanetworks.com/techdocs/ArubaDocPortal/content/cons-instant-home.htm)
+runs on IAPs (Instant Access points).
+
+The Oxidized model is [ArubaInstant](/lib/oxidized/model/arubainstant.rb).
+When run on the virtual WLAN controller, it will also collect the list of the
+WLAN-AP linked to the controller.
+
+The aosw model for AOS 8 used to be used for Aruba Instant, but it does not work
+as well and may stop working in the future.
+
+## HPE Aruba Networking Wireless Operating System 8 (AOS 8)
+[AOS 8](https://www.arubanetworks.com/techdocs/ArubaDocPortal/content/cons-aos-home.htm)
+runs on WLAN controllers (mobility controllers) and controller-managed access
+points.
+
+The Oxidized model is [aosw](/lib/oxidized/model/aosw.rb).
+
+## HPE Aruba Networking CX Switch Operating System (AOS-CX)
+[AOS-CX](https://www.arubanetworks.com/techdocs/AOS-CX/help_portal/Content/home.htm)
+is the operating system for the newer CX-Series.
+
+The Oxidized model is [aoscx](/lib/oxidized/model/aoscx.rb).
+
+## Older Models
+Older Devices like ProCurve or 3Com/Comware are listed under the Vendor "HP" in
+the [Supported OS Types](docs/Supported-OS-Types.md) list.
+

data/docs/Model-Notes/OS6.md

@@ -0,0 +1,10 @@
+# OS6 Configuration
+
+The commands Oxidized executes are:
+
+1. terminal length 0
+2. show version
+3. show interfaces transceiver properties
+4. show running-config
+
+Back to [Model-Notes](README.md)

data/docs/Model-Notes/RouterOS.md

@@ -0,0 +1,15 @@
+# Mikrotik RouterOS Configuration
+
+RouterOS 7.12 and later support ED25519 keys. 
+
+Create a key pair, save the public key (``id_ed25519.pub``) and save it on flash. Create a user
+and attach the public key.
+
+```text
+[admin@mikrotik] > /user add name=oxidized group=read disabled=no
+[admin@mikrotik] > /user ssh-keys import public-key-file=id_ed25519.pub user=oxidized
+```
+
+Oxidized can now retrieve your configuration!
+
+Back to [Model-Notes](README.md)

data/docs/Model-Notes/SikluMHTG.md

@@ -0,0 +1,7 @@
+# Siklu Multihaul Terragraph Radio Line
+
+The Siklu Multihaul TG radios use a different command set than the other Siklu radios.
+
+To use this model, your source must designate the model as siklumhtg instead of siklu. It also requires that the MH-TG radio be running at least version 2.1.2.
+
+Back to [Model-Notes](README.md)

data/docs/ModelUnitTests.md

@@ -0,0 +1,186 @@
+# Model Unit Tests
+Oxidized includes automated unit tests for its models, which require very little
+effort to use. There are three different default unit tests for models:
+- [Device Simulation](ModelUnitTests.md#device-simulation)
+- [Device Prompt](ModelUnitTests.md#device-prompt)
+- [Secrets](ModelUnitTests.md#secrets)
+
+You only need to provide test files under [/spec/model/data](/spec/model/data),
+and the tests will be run automatically with `rake test`. See
+[CONTRIBUTING.md](/CONTRIBUTING.md) for explanations on how to set up a
+development environment. In the following examples, we use
+[Bundler](https://bundler.io/) and prefix all commands with `bundle exec`.
+
+In addition, you can write [custom unit tests](ModelUnitTests.md#custom-tests)
+for your model
+
+## Device Simulation
+### YAML Simulation File
+You need a [YAML simulation file](/docs/DeviceSimulation.md) for your device.
+See the link for instructions on how to produce it.
+
+The YAML simulation files are stored under
+[/spec/model/data/](/spec/model/data/), with the naming convention
+`<model>:<description>:simulation.yaml`, where `<model>` is the lowercase name
+of the Oxidized model and `<description>` is the name of the test case.
+`<description>` is generally formatted as `<hardware>_<software>` or
+`<hardware>_<software>_<information>`.
+
+Using a correct name for the file is important to ensure it is included in
+automatic model unit tests.
+
+### Expected Output
+You need a second file that contains the expected output, which has the same
+name as the YAML simulation file but ends with `:output.txt` instead of
+`:simulation.yaml`.
+
+You can automatically produce an output file based on the current model for all
+YAML simulation files missing an `:output.txt`:
+```shell
+bundle exec ruby spec/model/atoms_generate.rb
+```
+
+In the following example,
+`spec/model/data/aoscx:R8N85A-C6000-48G-CL4_PL.10.08.1010:output.txt` (the
+second file in the list) was missing:
+
+```shell
+oxidized$ bundle exec ruby spec/model/atoms_generate.rb
+Run options: --seed 57811
+
+# Running:
+
+Generating output file for aoscx:R0X25A-6410_FL.10.10.1100:simulation... SKIP, output already exists
+Generating output file for aoscx:R8N85A-C6000-48G-CL4_PL.10.08.1010:simulation... OK
+Generating output file for arubainstant:IAP515_8.10.0.6_VWLC:simulation... SKIP, output already exists
+Generating output file for asa:5512_9.12-4-67_single-context:simulation... SKIP, output already exists
+Generating output file for garderos:R7709_003_006_068:simulation... SKIP, output already exists
+Generating output file for ios:C8200L_16.12.1:simulation... FAIL, no simulation file
+Generating output file for ios:C9200L-24P-4G_17.09.04a:simulation... SKIP, output already exists
+Generating output file for ios:C9800-L-F-K9_17.06.05:simulation... SKIP, output already exists
+Generating output file for ios:asr920_16.8.1b:simulation... SKIP, output already exists
+Generating output file for junos:srx300_22.4:simulation... SKIP, output already exists
+Generating output file for opnsense:nano_23.7:simulation... SKIP, output already exists
+Generating output file for pfsense:CE_2.7.2:simulation... SKIP, output already exists
+Generating output file for routeros:CHR_7.10.1:simulation... SKIP, output already exists
+Generating output file for routeros:CHR_7.16:simulation... SKIP, output already exists
+Generating output file for routeros:L009UiGS_7.15.2:simulation... SKIP, output already exists
+.
+
+Finished in 0.904792s, 1.1052 runs/s, 0.0000 assertions/s.
+
+1 runs, 0 assertions, 0 failures, 0 errors, 0 skips
+Coverage report generated for RSpec to /home/xxx/oxidized/coverage/coverage.xml. 651 / 1122 LOC (58.02%) covered
+Coverage report generated for RSpec to /home/xxx/oxidized/coverage.
+Line Coverage: 58.02% (651 / 1122)
+```
+
+### Running the Tests
+You can modify the `:output.txt` file to match your expectations and modify the
+model accordingly. Run `bundle exec rake` to run the tests.
+
+Here is an example when the output of the VTP command is missing in the expected
+output:
+
+```
+oxidized$ bundle exec rake test
+/usr/bin/ruby3.1 -I"lib:spec" /home/xxx/oxidized/vendor/bundle/ruby/3.1.0/gems/rake-13.2.1/lib/rake/rake_test_loader.rb "spec/cli_spec.rb" "spec/config_spec.rb" "spec/hook/githubrepo_spec.rb" "spec/input/ssh_spec.rb" "spec/manager_spec.rb" "spec/model/apc_aos_spec.rb" "spec/model/model_atoms_spec.rb" "spec/model/model_helper_spec.rb" "spec/node_spec.rb" "spec/nodes_spec.rb" "spec/output/file_spec.rb" "spec/output/git_spec.rb" "spec/refinements_spec.rb" "spec/source/csv_spec.rb" "spec/source/http_spec.rb" "spec/source/jsonfile_spec.rb" "spec/source/sql_spec.rb"
+Run options: --seed 31447
+
+# Running:
+
+...............................................................SS..................F.............................SS..
+
+Finished in 7.963602s, 14.6918 runs/s, 48.7217 assertions/s.
+
+  1) Failure:
+ATOMS tests#test_0006_ios:C9200L-24P-4G_17.09.04a:output has expected output [spec/model/model_atoms_spec.rb:12]:
+--- expected
++++ actual
+@@ -9,6 +9,21 @@
+ ! CPU: ARM64
+ ! Memory: nvram 2048K
+ !
++! VTP: VTP Version capable             : 1 to 3
++! VTP: VTP version running             : 1
++! VTP: VTP Domain Name                 : Oxidized
++! VTP: VTP Pruning Mode                : Disabled (Operationally Disabled)
++! VTP: VTP Traps Generation            : Disabled
++! VTP: Device ID                       : 40f0.7800.0000
++! VTP: Feature VLAN:
++! VTP: --------------
++! VTP: VTP Operating Mode                : Transparent
++! VTP: Maximum VLANs supported locally   : 1005
++! VTP: Number of existing VLANs          : 10
++! VTP: Configuration Revision            : 0
++! VTP: MD5 digest                        : 0x35 0x00 0x00 0x00 0x00 0x00 0x7F 0xB4
++! VTP:                                     0x07 0x00 0x00 0x00 0x00 0x00 0x09 0x6D
++!
+ ! NAME: \"c92xxL Stack\", DESCR: \"c92xxL Stack\"
+ ! PID: C9200L-24P-4G     , VID: V01  , SN: JAE24FFFFFF
+ !
+
+
+117 runs, 388 assertions, 1 failures, 0 errors, 4 skips
+
+You have skipped tests. Run with --verbose for details.
+Coverage report generated for RSpec to /home/xxx/oxidized/coverage/coverage.xml. 2167 / 3131 LOC (69.21%) covered
+Coverage report generated for RSpec to /home/xxx/oxidized/coverage.
+Line Coverage: 69.21% (2167 / 3131)
+rake aborted!
+Command failed with status (1): [ruby -I"lib:spec" /home/xxx/oxidized/vendor/bundle/ruby/3.1.0/gems/rake-13.2.1/lib/rake/rake_test_loader.rb "spec/cli_spec.rb" "spec/config_spec.rb" "spec/hook/githubrepo_spec.rb" "spec/input/ssh_spec.rb" "spec/manager_spec.rb" "spec/model/apc_aos_spec.rb" "spec/model/model_atoms_spec.rb" "spec/model/model_helper_spec.rb" "spec/node_spec.rb" "spec/nodes_spec.rb" "spec/output/file_spec.rb" "spec/output/git_spec.rb" "spec/refinements_spec.rb" "spec/source/csv_spec.rb" "spec/source/http_spec.rb" "spec/source/jsonfile_spec.rb" "spec/source/sql_spec.rb" ]
+/home/xxx/oxidized/vendor/bundle/ruby/3.1.0/gems/rake-13.2.1/exe/rake:27:in `<top (required)>'
+Tasks: TOP => test
+(See full trace by running task with --trace)
+```
+
+If you want to be sure that your model has been tested, run
+`bundle exec rake test TESTOPTS="--verbose"` and search for your models unter
+`ATOMS tests`
+
+## Device Prompt
+You can specify device prompts to test in a YAML file named
+`spec/model/data/<model>:generic:prompt.yaml`.
+
+The YAML file has three sections containing a list of prompts to test:
+- pass: these prompts will pass the prompt regexp.
+- pass_with_expect: these prompts will pass the prompt regexp after having been
+  cleaned by the expect commands.
+- fail: these prompts will fail the prompt regexp.
+
+Here is an example:
+```yaml
+pass:
+  - "LAB-R1234_Garderos# "
+pass_with_expect:
+  - "\e[4m\rLAB-R1234_Garderos#\e[m "
+fail:
+  - "\e[4m\rLAB-R1234_Garderos#\e[m "
+  - "#LAB#"
+```
+
+## Secrets
+You can test if the model effectively removes secrets from your YAML simulation
+file with a YAML file named like the YAML simulation, but with the suffix
+`:secret.yaml`.
+
+The YAML file has two sections containing a list of strings to test:
+- fail: the test will fail if the output contains these strings.
+- pass: the test will pass only if the output contains these strings.
+
+```yaml
+fail:
+  - 'AAAAAAAAAABBBBBBBBBBCCCCCCCCCC'
+pass:
+  - 'snmp-server host 10.10.42.12 version 2c <secret removed> inform'
+  - 'hash-mgmt-user oxidized password hash <secret removed>'
+  - 'hash-mgmt-user rocks password hash <secret removed> usertype read-only'
+```
+
+## Custom tests
+When you write custom tests for your models, please do not use the filenames
+mentioned above, as it will interfere with the standard tests. If you need to
+store a custom simulation file, use `model:description:custom_simulation.yaml`.
+
+The [cumulus test](/spec/model/cumulus_spec.rb) is an example of a custom
+test.

data/docs/Outputs.md

@@ -63,6 +63,8 @@ output:
 
 ```
 
+Over time, your Git repository will expand, potentially leading to performance issues. For instructions on how to address this, see [git performance issues with large device counts](Troubleshooting.md#git-performance-issues-with-large-device-counts).
+
 ## Output: Git-Crypt
 
 This uses the gem git and system git-crypt interfaces. Have a look at [GIT-Crypt](https://www.agwa.name/projects/git-crypt/) documentation to know how to install it.

data/docs/Release.md

@@ -5,45 +5,48 @@ This document is targeted at oxidized maintainers. It describes the release proc
 Run `git diff 0.30.0..master` (where `0.30.0` is to be changed to the last release) and review
 all the changes that have been done. Have a specific look at changes you don't understand.
 
+For a graphical compare, use `git difftool -d 0.30.0..master`.
+
 ## Test, test test!
 Test the git code and the container against as much device types an environments as you can.
 
 Do not integrate late PRs into master if they do not fix issues for the release. The must wait for the next release.
 
 ## Version numbering
-Oxidized versions are nummered like 0.major.minor
-- major is incremented when releasing new features. minor is then set to 0
-- minor is incremented when releasing fixes only, just after a major version.
+Oxidized versions are nummered like major.minor.patch
+- currently, the major version is 0.
+- minor is incremented when releasing new features.
+- patch is incremented when releasing fixes only.
 
-## Release
+## Prepare the release in your working repository
 1. Checkout the master branch of oxidized. Make sure you are up to date with origin.
 2. Change the version in lib/oxidized/version.rb
 3. Change CHANGELOG.md to replace [Unreleased] with [0.xx.yy – 202Y-MM-DD]
 4. Run `git diff` to check your changes
 5. Commit the changes to the local git repository with a commit message “chore(release): release version 0.xx.yy”
 6. Tag the commit with `git tag -a 0.xx.yy -m "Release 0.xx.yy"`
-7. Push the change and the tag to github:
+7. Build the gem with ‘rake build’
+8. Run `git diff` to check if there have been more changes (there shouldn't)
+9. Install an test the gem locally
+```
+gem install --user-install pkg/oxidized-0.30.0.gem
+~/.local/share/gem/ruby/3.1.0/bin/oxidized
+```
+
+## Release in github
+Push the change and the tag to github:
 ```
 git push
 git push origin 0.xx.yy
 ```
 
-## Release in github
 Make a release from the tag in github
 - Thank the contributors
 - Only describe major changes, and refer to CHANGELOG.md
 - List new contributors (generated automatically)
 
 ## Release in rubygems
-1. Build the gem with ‘rake build’
-2. Install an test the gem locally
-```
-gem install --user-install pkg/oxidized-0.30.0.gem
-~/.local/share/gem/ruby/3.1.0/bin/oxidized
-```
-3. Push the gem with ‘rake push’
-
-You need an account at rubygems which is allowed to push oxidized
+Push the gem with ‘rake push’
 
 ## Release in docker.io
 The OCI-Containter is automatically build and pushed to docker.io by github

data/docs/Sources.md

@@ -1,5 +1,8 @@
 # Sources
 
+Note: in all sources, the map attribute `name` is mandatory. It is used to identify the node and
+for example choose the filename for the configuration output.
+
 ## Source: CSV
 
 One line per device, colon separated. If `ip` isn't present, a DNS lookup will be done against `name`.  For large installations, setting `ip` will dramatically reduce startup time.
@@ -55,6 +58,24 @@ and within: `~/.gnupg/gpg.conf`
 pinentry-mode loopback
 ```
 
+## Source: JSONFile
+
+One object per device. Supports GPG encryption like the CSV Source.
+
+```yaml
+source:
+  default: jsonfile
+  jsonfile: 
+    file: /var/lib/oxidized/router.json
+    map:
+      name: hostname
+      model: os
+      username: username
+      password: password
+    vars_map:
+      enable: enable
+```
+
 ## Source: SQL
 
  Oxidized uses the `sequel` ruby gem. You can use a variety of databases that aren't explicitly listed. For more information visit https://github.com/jeremyevans/sequel Make sure you have the correct adapter!

data/docs/Supported-OS-Types.md

@@ -8,8 +8,8 @@
 |AddPack             |AddPack                       |[addpack](/lib/oxidized/model/addpack.rb)
 |Adtran              |Total Access (AOS)            |[adtran](/lib/oxidized/model/adtran.rb)
 |                    |ADVA                          |[adva](/lib/oxidized/model/adva.rb)              |                 |[ADVA](Model-Notes/ADVA.md)
-|Alcatel-Lucent      |AOS                           |[aos](/lib/oxidized/model/aos.rb)
-|                    |AOS7                          |[aos7](/lib/oxidized/model/aos7.rb)
+|Alcatel-Lucent      |AOS                           |[aos](/lib/oxidized/model/aos.rb)                |                 |AOS6 - vxworks-based
+|                    |AOS7                          |[aos7](/lib/oxidized/model/aos7.rb)              |                 |AOS7 and AOS8 - linux-based
 |                    |ISAM                          |[isam](/lib/oxidized/model/isam.rb)
 |                    |SR OS (Formerly TiMOS)        |[sros](/lib/oxidized/model/sros.rb)
 |                    |Wireless                      |[aosw](/lib/oxidized/model/aosw.rb)              |                 |Same model as Aruba Wireless
@@ -20,8 +20,9 @@
 |Arbor Networks      |ArbOS                         |[arbos](/lib/oxidized/model/arbos.rb)            |                 |[ArbOS](Model-Notes/ArbOS.md)
 |Arista              |EOS                           |[eos](/lib/oxidized/model/eos.rb)                |                 |[EOS](Model-Notes/EOS.md)
 |Arris               |C4CMTS                        |[c4cmts](/lib/oxidized/model/c4cmts.rb)
-|Aruba               |AOS-CX                        |[aoscx](/lib/oxidized/model/aoscx.rb)            |@robertcheramy
-|                    |AOSW                          |[Aaosw](/lib/oxidized/model/aosw.rb)
+|Aruba               |AOS-CX                        |[aoscx](/lib/oxidized/model/aoscx.rb)            |@robertcheramy   |[HPE Aruba](Model-Notes/HPEAruba.md)
+|                    |AOSW                          |[aosw](/lib/oxidized/model/aosw.rb)                                |[HPE Aruba](Model-Notes/HPEAruba.md)
+|                    |ArubaInstant                  |[arubainstant](/lib/oxidized/model/arubainstant.rb)|@robertcheramy |[HPE Aruba](Model-Notes/HPEAruba.md)
 |Asterfusion         |AsterNOS                      |[asternos](/lib/oxidized/model/asternos.rb)
 |AudioCodes          |AudioCodes                    |[audiocodes](/lib/oxidized/model/audiocodes.rb)
 |                    |MediaPack MP-1xx, Mediant1000 |[audiocodesmp](/lib/oxidized/model/audiocodesmp.rb)
@@ -70,6 +71,7 @@
 |DELL                |PowerConnect                  |[powerconnect](/lib/oxidized/model/powerconnect.rb)
 |                    |AOSW                          |[aosw](/lib/oxidized/model/aosw.rb)              |                 |Same model as Aruba Wireless
 |                    |DellX                         |[dellx](/lib/oxidized/model/dellx.rb)
+|                    |Dell EMC Networking OS6       |[os6](/lib/oxidized/model/os6.rb)              |                 |[Dell EMC Networking OS6](Model-Notes/OS6.md)
 |                    |Dell EMC Networking OS10      |[os10](/lib/oxidized/model/os10.rb)              |                 |[Dell EMC Networking OS10](Model-Notes/OS10.md)
 |D-Link              |D-Link                        |[dlink](/lib/oxidized/model/dlink.rb)
 |                    |D-Link cisco like CLI         |[dlinknextgen](/lib/oxidized/model/dlinknextgen.rb)
@@ -82,7 +84,8 @@
 |                    |Enterasys 800-Series          |[enterasys800](/lib/oxidized/model/enterasys800.rb)
 |                    |WM                            |[mtrlrfs](/lib/oxidized/model/mtrlrfs.rb)
 |                    |XOS, ExtremeWare              |[xos](/lib/oxidized/model/xos.rb)
-|F5                  |TMOS                          |[tmos](/lib/oxidized/model/tmos.rb)
+|F5                  |F5OS                          |[tmos](/lib/oxidized/model/f5os.rb)
+|                    |TMOS                          |[tmos](/lib/oxidized/model/tmos.rb)
 |Fiberstore (fs.com) |S3400                         |[fsos](/lib/oxidized/model/fsos.rb)              |                 |[FSOS](Model-Notes/FSOS.md)
 |                    |S3800                         |[gcombnps](/lib/oxidized/model/gcombnps.rb)
 |                    |S3900                         |[edgecos](/lib/oxidized/model/edgecos.rb)
@@ -119,7 +122,7 @@
 |Linuxgeneric        |CentOS                        |[linuxgeneric](/lib/oxidized/model/linuxgeneric.rb)|               |[LinuxGeneric](Model-Notes/LinuxGeneric.md)
 |Mellanox            |MLNX-OS                       |[mlnxos](/lib/oxidized/model/mlnxos.rb)
 |                    |Voltaire                      |[voltaire](/lib/oxidized/model/voltaire.rb)
-|Mikrotik            |RouterOS                      |[routeros](/lib/oxidized/model/routeros.rb)
+|Mikrotik            |RouterOS                      |[routeros](/lib/oxidized/model/routeros.rb)      |  |[RouterOS](Model-Notes/RouterOS.md)
 |                    |SwOS and SwOS Lite            |[swos](/lib/oxidized/model/swos.rb)
 |Mimosa              |Mimosa (B11)                  |[mimosab11](/lib/oxidized/model/mimosab11.rb)
 |Motorola            |RFS                           |[mtrlrfs](/lib/oxidized/model/mtrlrfs.rb)
@@ -145,7 +148,8 @@
 |Ruijie Networks     |RGOS                          |[rgos](/lib/oxidized/model/rgos.rb)
 |QTECH               |QSW-2800, QSW-3400, QSW-3450, QSW-3500|[qtech](/lib/oxidized/model/qtech.rb)
 |Quanta              |Quanta / VxWorks 6.6 (1.1.0.8)|[quantaos](/lib/oxidized/model/quantaos.rb)
-|Siklu               |EtherHaul                     |[siklu](/lib/oxidized/model/siklu.rb)
+|Siklu               |EtherHaul                     |[siklu](/lib/oxidized/model/siklu.rb)            |@bdg-robert
+|                    |Multihaul TG                  |[siklumhtg](/lib/oxidized/model/siklumhtg.rb)    |@bdg-robert      |[Siklu Multihaul TG](Model-Notes/SikluMHTG.md)
 |Seiko Solutions     |SmartCS, SmartCS mini         |[smartcs](/lib/oxidized/model/smartcs.rb)
 |SonicWALL           |SonicOS                       |[sonicos](/lib/oxidized/model/sonicos.rb)
 |SNR                 |SNR-S300G, S2xxx, S3xxx, S4xxx|[dcnos](/lib/oxidized/model/dcnos.rb)
@@ -165,10 +169,13 @@
 |                    |Edgeos                        |[edgeos](/lib/oxidized/model/edgeos.rb)
 |                    |EdgeSwitch                    |[edgeswitch](/lib/oxidized/model/edgeswitch.rb)
 |                    |AirFiber                      |[airfiber](/lib/oxidized/model/airfiber.rb)
+|Uplink              |EP4440-DP                     |[EP4440](/lib/oxidized/model/uplinkolt.rb)             | |Might support all EP4440 series
 |VMWare              |NSX Edge (configuration)      |[nsxconfig](/lib/oxidized/model/nsxconfig.rb)
 |                    |NSX Edge (firewall rules)     |[nsxfirewall](/lib/oxidized/model/nsxfirewall.rb)
+|                    |NSX Distributed Firewall      |[nsxdfw](/lib/oxidized/model/nsxdfw.rb)
 |Watchguard          |Fireware OS                   |[firewareos](/lib/oxidized/model/firewareos.rb)
 |Westell             |Westell 8178G, Westell 8266G  |[weos](/lib/oxidized/model/weos.rb)
+|Yadro               |KornfeldOS                    |[kornfeldos](/lib/oxidized/model/kornfeldos.rb) 
 |YAMAHA              |YAMAHA NVR/RTX Series         |[yamaha](/lib/oxidized/model/yamaha.rb)
 |Zhone               |Zhone (OLT and MX)            |[zhoneolt](/lib/oxidized/model/zhoneolt.rb)
 |ZPE                 |Nodegrid OS                   |[nodegrid](/lib/oxidized/model/nodegrid.rb)

data/docs/Troubleshooting.md

@@ -1,4 +1,9 @@
 # Troubleshooting
+## Table of contents
+1. [Connects but no/partial configuration collected](#oxidized-connects-to-a-supported-device-but-no-or-partial-configuration-is-collected)
+2. [No push to remote git repository](#oxidized-does-not-push-to-a-remote-git-repository-hook-githubrepo)
+3. [Git performance issues with large device counts](#git-performance-issues-with-large-device-counts)
+4. [Oxidized ignores the changes I made to its git repository](#oxidized-ignores-the-changes-i-made-to-its-git-repository)
 
 ## Oxidized connects to a supported device but no (or partial) configuration is collected
 
@@ -80,3 +85,33 @@ If you are running oxidized in a container, you need to map /home/oxidized/.ssh
 container to a local repository and save the known_hosts in the local repository. You can
 find an example how to do this under [examples/podman-compose](/examples/podman-compose/)
 
+## Git performance issues with large device counts
+When you use git to store your configurations, the size of your repository will
+grow over time. This growth can lead to performance issues. To resolve these issues, you should perform a Git garbage collection on your repository.
+
+Follow these steps to do so:
+
+1. Stop oxidized (no one should access the git repository while running garbage collection)
+2. Make a backup of your oxidized data, especially the Git repository
+3. Change directory your oxidized git repository (as configured in oxidized configuration file)
+4. Execute the command `git gc` to run the garbage collection
+5. Restart oxidized - you're done!
+
+## Oxidized ignores the changes I made to its git repository
+First of all: you shouldn't manipulate the git repository of oxidized. Don't
+create it, don't modify it, leave it alone. You can break things. You have
+been warned.
+
+In some situations, you may need to make changes to the git repository of
+oxidized. Stop oxidized, make backups, and be sure you know exactly what you
+are doing. You have been warned.
+
+If you simply clone the git repository, make changes and push them, oxidized
+will ignore these modifications. This is because oxidized caches the HEAD tree
+in the index and `git push` does not update the index because the repository is
+a bare repo and not a working directory repository.
+
+So, you have to update the index manually. For this, go into oxidized repo, and
+run `git ls-tree -r HEAD | git update-index --index-info`. While you're at it,
+consider running `git gc`, as oxidized cannot garbage collect the repo (this
+is not supported in [Rugged](https://github.com/libgit2/rugged)).