From 3362e0ee7b779da8c33d4ed3c8228452c3db8f35 Mon Sep 17 00:00:00 2001 From: JStandiford <49761309+JStandiford@users.noreply.github.com> Date: Wed, 12 Apr 2023 10:11:49 -0500 Subject: [PATCH] fortivoice: add version, hardware and serial collection (#14956) * Update fortivoice.yaml Add in pulling in device hardware and software info * Add files via upload * Add files via upload * merge test data * Delete fortivoice_fortivoice.snmprec * Update fortivoice.json * Update fortivoice.json --------- Co-authored-by: Tony Murray --- includes/definitions/discovery/fortivoice.yaml | 4 ++++ tests/data/fortivoice.json | 6 +++--- tests/snmpsim/fortivoice.snmprec | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/includes/definitions/discovery/fortivoice.yaml b/includes/definitions/discovery/fortivoice.yaml index 287f05c882..76f9674b02 100644 --- a/includes/definitions/discovery/fortivoice.yaml +++ b/includes/definitions/discovery/fortivoice.yaml @@ -1,5 +1,9 @@ mib: FORTINET-FORTIVOICE-MIB modules: + os: + version: FORTINET-FORTIVOICE-MIB::fvSysVersion.0 + serial: FORTINET-FORTIVOICE-MIB::fvSysSerial.0 + hardware: FORTINET-FORTIVOICE-MIB::fvSysModel.0 processors: data: - diff --git a/tests/data/fortivoice.json b/tests/data/fortivoice.json index 5e117205e8..d2ca577ba4 100644 --- a/tests/data/fortivoice.json +++ b/tests/data/fortivoice.json @@ -7,13 +7,13 @@ "sysObjectID": ".1.3.6.1.4.1.12356.115", "sysDescr": "", "sysContact": "", - "version": null, - "hardware": null, + "version": "v6.0.11(GA), build285, 2022.03.28", + "hardware": "FortiVoice-500F", "features": null, "location": "", "os": "fortivoice", "type": "firewall", - "serial": null, + "serial": "FO500FT919000082", "icon": "fortinet.svg" } ] diff --git a/tests/snmpsim/fortivoice.snmprec b/tests/snmpsim/fortivoice.snmprec index 9a6dd294f5..3d33daafed 100644 --- a/tests/snmpsim/fortivoice.snmprec +++ b/tests/snmpsim/fortivoice.snmprec @@ -156,6 +156,9 @@ 1.3.6.1.2.1.10.7.2.1.19.2|2|0 1.3.6.1.2.1.10.7.2.1.19.3|2|0 1.3.6.1.2.1.10.7.2.1.19.4|2|0 +1.3.6.1.4.1.12356.115.1.1.0|4|FortiVoice-500F +1.3.6.1.4.1.12356.115.1.2.0|4|FO500FT919000082 +1.3.6.1.4.1.12356.115.1.3.0|4|v6.0.11(GA), build285, 2022.03.28 1.3.6.1.4.1.12356.115.1.6.0|66|0 1.3.6.1.4.1.12356.115.1.200.1.0|2|0 1.3.6.1.4.1.12356.115.1.200.2.0|2|0