From dfb22b5d2a843ea973a01a77be498f390abebc97 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Sat, 4 Feb 2017 17:49:36 -0600
Subject: [PATCH] Change Qnap discovery to yaml (#5769)

---
 includes/definitions/qnap.yaml      | 2 ++
 includes/discovery/os/linux.inc.php | 4 +---
 tests/snmpsim/qnap.snmprec          | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/includes/definitions/qnap.yaml b/includes/definitions/qnap.yaml
index 93c57a156f..35ba893830 100644
--- a/includes/definitions/qnap.yaml
+++ b/includes/definitions/qnap.yaml
@@ -8,3 +8,5 @@ over:
     - { graph: device_mempool, text: 'Memory Usage' }
     - { graph: device_storage, text: 'Storage Usage' }
 processor_stacked: 1
+discovery:
+    - sysObjectId: .1.3.6.1.4.1.24681
diff --git a/includes/discovery/os/linux.inc.php b/includes/discovery/os/linux.inc.php
index 51af9194a0..5722371258 100644
--- a/includes/discovery/os/linux.inc.php
+++ b/includes/discovery/os/linux.inc.php
@@ -5,9 +5,7 @@ if (starts_with($sysDescr, 'Linux') || starts_with($sysObjectId, '.1.3.6.1.4.1.8
     $os = 'linux';
 
     // Specific Linux-derivatives
-    if (str_contains(snmp_get($device, 'ENTITY-MIB::entPhysicalMfgName.1', '-Osqnv'), 'QNAP')) {
-        $os = 'qnap';
-    } elseif (starts_with($sysObjectId, array('.1.3.6.1.4.1.10002.1', '.1.3.6.1.4.1.41112.1.4')) || str_contains(snmp_get($device, 'dot11manufacturerName.5', '-Osqnv', 'IEEE802dot11-MIB'), 'Ubiquiti')) {
+    if (starts_with($sysObjectId, array('.1.3.6.1.4.1.10002.1', '.1.3.6.1.4.1.41112.1.4')) || str_contains(snmp_get($device, 'dot11manufacturerName.5', '-Osqnv', 'IEEE802dot11-MIB'), 'Ubiquiti')) {
         $os = 'airos';
         if (str_contains(snmp_walk($device, 'dot11manufacturerProductName', '-Osqnv', 'IEEE802dot11-MIB'), 'UAP')) {
             $os = 'unifi';
diff --git a/tests/snmpsim/qnap.snmprec b/tests/snmpsim/qnap.snmprec
index 2a89cd9187..c9f0f56ef1 100644
--- a/tests/snmpsim/qnap.snmprec
+++ b/tests/snmpsim/qnap.snmprec
@@ -1,2 +1,3 @@
-1.3.6.1.2.1.1.1.0|4|Linux
+1.3.6.1.2.1.1.1.0|4|Linux hostname 4.2.2
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.24681
 1.3.6.1.2.1.47.1.1.1.1.12.1|4|QNAP